diff --git a/android/src/main/java/com/jimmydaddy/imagemarker/base/Utils.kt b/android/src/main/java/com/jimmydaddy/imagemarker/base/Utils.kt
index 384e450..64ac288 100644
--- a/android/src/main/java/com/jimmydaddy/imagemarker/base/Utils.kt
+++ b/android/src/main/java/com/jimmydaddy/imagemarker/base/Utils.kt
@@ -160,15 +160,15 @@ class Utils {
     }
 
     fun handleDynamicToString(d: Dynamic?): String {
-      return if (d == null) "0"
-      else
-          when (d.type) {
-            ReadableType.String -> d.asString()!!
-            ReadableType.Number -> d.asDouble().toString()!!
-            else -> {
-              "0"
+        return if (d == null) {
+            "0"
+        } else {
+            when (d.type) {
+                ReadableType.String -> d.asString() ?: "0"
+                ReadableType.Number -> d.asDouble().toString()
+                else -> "0"
             }
-          }
+        }
     }
   }