diff --git a/lib/src/RawEvent.dart b/lib/src/RawEvent.dart
index 66ea7a0..4926bc7 100644
--- a/lib/src/RawEvent.dart
+++ b/lib/src/RawEvent.dart
@@ -67,7 +67,8 @@ class RawEvent {
 
   static Map<String, dynamic> getMapFromPayload(dynamic payload) {
     print("getMapFromPayload: $payload");
-    if (payload is String && !payload.isEmpty) return json.decode(payload);
+    if (payload == null || (payload is String && payload.isEmpty)) return null;
+    if (payload is String) return json.decode(payload);
     if (payload is Map<String, dynamic>) return payload;
     return null;
   }