diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
index 6e433843a1..915baab015 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java
@@ -35,7 +35,9 @@ public abstract class MogoBaseMapView extends FrameLayout implements ILifeCycle
 
     private void init( Context context ) {
         addMapView( context );
-        MogoMap.getInstance().init( getContext(), mMapView.getMap() );
+        if (mMapView != null){
+            MogoMap.getInstance().init( getContext(), mMapView.getMap() );
+        }
     }
 
     protected abstract void addMapView( Context context );
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
index d001579a19..be40cc27ed 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/intent/IntentManager.java
@@ -73,7 +73,7 @@ public class IntentManager implements IMogoIntentManager {
 
     @Override
     public void invoke( String command, Intent intent ) {
-        List< IMogoIntentListener > listeners = mListeners.get( command );
+        CopyOnWriteArrayList< IMogoIntentListener > listeners = mListeners.get( command );
         if ( listeners != null && !listeners.isEmpty() ) {
             Iterator< IMogoIntentListener > iterator = listeners.iterator();
             while ( iterator.hasNext() ) {