diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
index 5b2fe6f0ba..1ed52135ce 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -82,23 +82,31 @@ class PM2DrivingInfoFragment :
 
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
-        overMapView.onCreateView(savedInstanceState)
+        overMapView?.let {
+            it.onCreateView(savedInstanceState)
+        }
     }
 
     override fun onResume() {
         super.onResume()
-        overMapView.onResume()
+        overMapView?.let{
+            it.onResume()
+        }
     }
 
     override fun onPause() {
         super.onPause()
-        overMapView.onPause()
+        overMapView?.let{
+            it.onPause()
+        }
     }
 
     override fun onDestroy() {
         timeHandler?.removeCallbacksAndMessages(null)
         super.onDestroy()
-        overMapView.onDestroy()
+        overMapView?.let{
+            it.onDestroy()
+        }
     }
 
     fun updateSpeed(speed: Int){
@@ -152,8 +160,12 @@ class PM2DrivingInfoFragment :
         line_during_tv.visibility = View.GONE
         no_line_tv.visibility = View.VISIBLE
         updateNoStationView()
-        overMapView.clearSiteMarkers()
-        overMapView.clearCustomPolyline()
+        overMapView?.let {
+            it.clearSiteMarkers()
+        }
+        overMapView?.let {
+            it.clearCustomPolyline()
+        }
     }
 
     private fun updateNoStationView(){
@@ -184,8 +196,10 @@ class PM2DrivingInfoFragment :
             var latLng = LatLng(station.gcjLat,station.gcjLon)
             stationsList.add(latLng)
         }
-        overMapView?.drawSiteMarkers(stationsList,
-            BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.9f)
+        overMapView?.let {
+            it.drawSiteMarkers(stationsList,
+                BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.9f)
+        }
     }
 
     fun updateStationsInfo(stations: MutableList<PM2Station>, i: Int, isArrived: Boolean){