From 7edffb1219ed92856f36d4933a2ca3af1d113f54 Mon Sep 17 00:00:00 2001
From: Christian Pauly <Christian-pauly@posteo.de>
Date: Thu, 29 Aug 2019 08:56:10 +0200
Subject: [PATCH] [Event] Better nullcheck

---
 lib/src/RawEvent.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/RawEvent.dart b/lib/src/RawEvent.dart
index 66ea7a00..4926bc79 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;
   }