2 files changed, 9 insertions, 5 deletions
diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
index 55ffc1e..4db25e1 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
@@ -3,6 +3,7 @@
 @using LibMatrix.EventTypes.Spec.State
 @using LibMatrix.Homeservers
 @using LibMatrix.Responses
+@using MatrixRoomUtils.Abstractions
 <details>
     <summary>@RoomType (@Rooms.Count)</summary>
     @foreach (var room in Rooms) {
@@ -42,17 +43,19 @@
     private List<RoomInfo> Rooms => Category.Value;
 
     private int RoomVersionDangerLevel(RoomInfo room) {
-        var roomVersion = room.StateEvents.FirstOrDefault(x => x.Type == "m.room.create");
-        if (roomVersion is null) return 0;
-        return roomVersion.TypedContent is not RoomCreateEventContent roomVersionContent ? 0
+        var creationEvent = room.StateEvents.FirstOrDefault(x => x?.Type == "m.room.create");
+        if (creationEvent is null) return 0;
+        return creationEvent.TypedContent is not RoomCreateEventContent roomVersionContent ? 0
             : RoomConstants.DangerousRoomVersions.Contains(roomVersionContent.RoomVersion) ? 2
                 : roomVersionContent.RoomVersion != RoomConstants.RecommendedRoomVersion ? 1 : 0;
     }
     
     public static string GetRoomTypeName(string roomType) {
         return roomType switch {
-            "Room" => "Rooms",
-            "org.matrix.mjolnir.policy" => "Policies",
+            null => "Room",
+            "m.space" => "Space",
+            "org.matrix.mjolnir.policy" => "Policy room",
+            
             _ => roomType
         };
     }
diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
index e08f98d..a6c006b 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
@@ -1,4 +1,5 @@
 @using System.Collections.ObjectModel
+@using MatrixRoomUtils.Abstractions
 <MatrixRoomUtils.Web.Shared.SimpleComponents.LinkButton href="@($"/Rooms/{Space.Room.RoomId}/Space")">Manage space</MatrixRoomUtils.Web.Shared.SimpleComponents.LinkButton>
 
 <br/>