diff --git a/android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java b/android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java
index b9507000af..8094ee7590 100644
--- a/android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java
+++ b/android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java
@@ -403,6 +403,7 @@ public void onInterruptionEnd() {
             }
         });
         result.success(null);
+        break;
       }
       case "createPeerConnection": {
         Map<String, Object> constraints = call.argument("constraints");
diff --git a/android/src/main/java/io/getstream/webrtc/flutter/utils/ConstraintsMap.java b/android/src/main/java/io/getstream/webrtc/flutter/utils/ConstraintsMap.java
index 3e7ff28edc..3656283b27 100644
--- a/android/src/main/java/io/getstream/webrtc/flutter/utils/ConstraintsMap.java
+++ b/android/src/main/java/io/getstream/webrtc/flutter/utils/ConstraintsMap.java
@@ -13,7 +13,7 @@ public ConstraintsMap(){
     }
 
     public ConstraintsMap(Map<String, Object> map){
-        this.mMap = map;
+        this.mMap = (map != null) ? map : new HashMap<String, Object>();
     }
 
     public Map<String, Object> toMap() {