diff --git a/lib/src/Room.dart b/lib/src/Room.dart
index 49a1a849..19ed7682 100644
--- a/lib/src/Room.dart
+++ b/lib/src/Room.dart
@@ -130,7 +130,7 @@ class Room {
 
   /// The last message sent to this room.
   String get lastMessage {
-    if (events?.length > 0)
+    if (events != null && events.length > 0)
       return events[0].getBody();
     else
       return "";
diff --git a/lib/src/Store.dart b/lib/src/Store.dart
index d05dd0aa..13f244a1 100644
--- a/lib/src/Store.dart
+++ b/lib/src/Store.dart
@@ -186,10 +186,11 @@ class Store {
           final Map<String, dynamic> directMap = userUpdate.content["content"];
           directMap.forEach((String key, dynamic value) {
             if (value is List<dynamic> && value.length > 0)
-              for (int i = 0; i < value.length; i++)
+              for (int i = 0; i < value.length; i++) {
                 txn.rawUpdate(
                     "UPDATE Rooms SET direct_chat_matrix_id=? WHERE id=?",
                     [key, value[i]]);
+              }
           });
         }
         break;