diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/IndexTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/IndexTag.kt
index 53f45096..23b29ff0 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/IndexTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/IndexTag.kt
@@ -16,9 +16,10 @@ class IndexTag(
         fun parse(tag: Array<String>): IndexTag? {
             ensure(tag.has(1)) { return null }
             ensure(tag[0] == TAG_NAME) { return null }
-            // TODO: Check that it is an int...
+
+            val index = tag[1].toIntOrNull() ?: return null
             return IndexTag(
-                index = tag[1].toInt(),
+                index = index,
             )
         }
 
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/WordStatisticsTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/WordStatisticsTag.kt
index ff215dab..3829dba1 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/WordStatisticsTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/WordStatisticsTag.kt
@@ -16,12 +16,15 @@ class WordStatisticsTag(
         const val TAG_NAME = "word_stats"
 
         fun parse(tag: Array<String>): WordStatisticsTag? {
-            ensure(tag.has(3)) { return null }
+            ensure(tag.has(2)) { return null }
             ensure(tag[0] == TAG_NAME) { return null }
 
+            val wordCount = tag[1].toIntOrNull() ?: return null
+            val characterCount = tag[2].toIntOrNull() ?: return null
+
             return WordStatisticsTag(
-                wordCount = tag[1].toInt(),
-                characterCount = tag[2].toInt(),
+                wordCount = wordCount,
+                characterCount = characterCount,
             )
         }