diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index 8c84eb21..6d12fc71 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -161,8 +161,8 @@ class FluffyRoutes {
                 return ViewData(
                   leftView: (_) => Settings(),
                   mainView: (_) => EmotesSettings(
-                    room: (settings.arguments as Map)['room'],
-                    stateKey: (settings.arguments as Map)['stateKey'],
+                    room: ((settings.arguments ?? {}) as Map)['room'],
+                    stateKey: ((settings.arguments ?? {}) as Map)['stateKey'],
                   ),
                 );
               case 'ignore':
diff --git a/lib/views/home_view_parts/discover.dart b/lib/views/home_view_parts/discover.dart
index 5eca5c69..1127dfd8 100644
--- a/lib/views/home_view_parts/discover.dart
+++ b/lib/views/home_view_parts/discover.dart
@@ -110,7 +110,7 @@ class _DiscoverState extends State<Discover> {
     }).then((PublicRoomsResponse res) {
       if (widget.alias != null &&
           !res.chunk.any((room) =>
-              room.aliases.contains(widget.alias) ||
+              (room.aliases?.contains(widget.alias) ?? false) ||
               room.canonicalAlias == widget.alias)) {
         // we have to tack on the original alias
         res.chunk.add(PublicRoom.fromJson(<String, dynamic>{