diff --git a/android/src/main/java/io/fullstack/firestack/FirestackUtils.java b/android/src/main/java/io/fullstack/firestack/FirestackUtils.java index 32c871a..43be13c 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackUtils.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackUtils.java @@ -164,8 +164,12 @@ public static WritableArray getChildKeys(DataSnapshot snapshot) { } public static Map recursivelyDeconstructReadableMap(ReadableMap readableMap) { - ReadableMapKeySetIterator iterator = readableMap.keySetIterator(); Map deconstructedMap = new HashMap<>(); + if (readableMap == null) { + return deconstructedMap; + } + + ReadableMapKeySetIterator iterator = readableMap.keySetIterator(); while (iterator.hasNextKey()) { String key = iterator.nextKey(); ReadableType type = readableMap.getType(key);