diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
index e511cd844..a79d677f2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -926,7 +926,14 @@ open class Note(
         }
     }
 
-    fun <T : Event> toEventHint() = (event as? T)?.let { EventHintBundle(it, relayHintUrl(), author?.bestRelayHint()) }
+    inline fun <reified T : Event> toEventHint(): EventHintBundle<T>? {
+        val safeEvent = event
+        return if (safeEvent is T) {
+            EventHintBundle(safeEvent, relayHintUrl(), author?.bestRelayHint())
+        } else {
+            null
+        }
+    }
 
     fun toMarkedETag(marker: MarkedETag.MARKER): MarkedETag {
         val noteEvent = event
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/dal/HiddenAccountsFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/dal/HiddenAccountsFeedViewModel.kt
index 8b25172b3..0de1d2933 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/dal/HiddenAccountsFeedViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/dal/HiddenAccountsFeedViewModel.kt
@@ -31,7 +31,12 @@ class HiddenAccountsFeedViewModel(
     class Factory(
         val account: Account,
     ) : ViewModelProvider.Factory {
-        @Suppress("UNCHECKED_CAST")
-        override fun <T : ViewModel> create(modelClass: Class<T>): T = HiddenAccountsFeedViewModel(account) as T
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            if (modelClass.isAssignableFrom(HiddenAccountsFeedViewModel::class.java)) {
+                @Suppress("UNCHECKED_CAST")
+                return HiddenAccountsFeedViewModel(account) as T
+            }
+            throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
+        }
     }
 }