diff --git a/android/src/main/java/com/brentvatne/common/api/CMCDProps.kt b/android/src/main/java/com/brentvatne/common/api/CMCDProps.kt
index dfff54b5..ef30feae 100644
--- a/android/src/main/java/com/brentvatne/common/api/CMCDProps.kt
+++ b/android/src/main/java/com/brentvatne/common/api/CMCDProps.kt
@@ -37,10 +37,10 @@ data class CMCDProps(
 
             return (0 until array.size()).mapNotNull { i ->
                 val item = array.getMap(i)
-                val key = item.getString("key")
-                val value = when (item.getType("value")) {
-                    ReadableType.Number -> item.getDouble("value")
-                    ReadableType.String -> item.getString("value")
+                val key = item?.getString("key")
+                val value = when (item?.getType("value")) {
+                    ReadableType.Number -> item?.getDouble("value")
+                    ReadableType.String -> item?.getString("value")
                     else -> null
                 }
 
diff --git a/android/src/main/java/com/brentvatne/common/api/SideLoadedTextTrackList.kt b/android/src/main/java/com/brentvatne/common/api/SideLoadedTextTrackList.kt
index 494facdc..1eb5f379 100644
--- a/android/src/main/java/com/brentvatne/common/api/SideLoadedTextTrackList.kt
+++ b/android/src/main/java/com/brentvatne/common/api/SideLoadedTextTrackList.kt
@@ -24,8 +24,10 @@ class SideLoadedTextTrackList {
             }
             val sideLoadedTextTrackList = SideLoadedTextTrackList()
             for (i in 0 until src.size()) {
-                val textTrack: ReadableMap = src.getMap(i)
-                sideLoadedTextTrackList.tracks.add(SideLoadedTextTrack.parse(textTrack))
+                val textTrack: ReadableMap? = src.getMap(i)
+                textTrack?.let {
+                    sideLoadedTextTrackList.tracks.add(SideLoadedTextTrack.parse(it))
+                }
             }
             return sideLoadedTextTrackList
         }
diff --git a/android/src/main/java/com/brentvatne/common/api/Source.kt b/android/src/main/java/com/brentvatne/common/api/Source.kt
index a0e0cfea..ef807e54 100644
--- a/android/src/main/java/com/brentvatne/common/api/Source.kt
+++ b/android/src/main/java/com/brentvatne/common/api/Source.kt
@@ -255,8 +255,8 @@ class Source {
                     if (propSrcHeadersArray.size() > 0) {
                         for (i in 0 until propSrcHeadersArray.size()) {
                             val current = propSrcHeadersArray.getMap(i)
-                            val key = if (current.hasKey("key")) current.getString("key") else null
-                            val value = if (current.hasKey("value")) current.getString("value") else null
+                            val key = current?.getString("key")
+                            val value = current?.getString("value")
                             if (key != null && value != null) {
                                 source.headers[key] = value
                             }