diff --git a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toClient/MessageDeserializer.kt b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toClient/MessageDeserializer.kt
index 0cf7c0a53..dbc03c469 100644
--- a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toClient/MessageDeserializer.kt
+++ b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toClient/MessageDeserializer.kt
@@ -31,15 +31,14 @@ class MessageDeserializer : StdDeserializer<Message>(Message::class.java) {
     override fun deserialize(
         jp: JsonParser,
         ctxt: DeserializationContext,
-    ): Message? {
+    ): Message {
         // Expect to start with a JSON array token
         if (jp.currentToken != JsonToken.START_ARRAY) {
             ctxt.reportWrongTokenException(this, JsonToken.START_ARRAY, "Expected START_ARRAY token")
         }
 
-        val type = jp.nextTextValue()
         val message =
-            when (type) {
+            when (val type = jp.nextTextValue()) {
                 EventMessage.LABEL -> {
                     val subId = jp.nextTextValue()
                     jp.nextToken()
diff --git a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandDeserializer.kt b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandDeserializer.kt
index 154b19083..f84a2b884 100644
--- a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandDeserializer.kt
+++ b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip01Core/relay/commands/toRelay/CommandDeserializer.kt
@@ -35,15 +35,14 @@ class CommandDeserializer : StdDeserializer<Command>(Command::class.java) {
     override fun deserialize(
         jp: JsonParser,
         ctxt: DeserializationContext,
-    ): Command? {
+    ): Command {
         // Expect to start with a JSON array token
         if (jp.currentToken != JsonToken.START_ARRAY) {
             ctxt.reportWrongTokenException(this, JsonToken.START_ARRAY, "Expected START_ARRAY token")
         }
 
-        val type = jp.nextTextValue()
         val message =
-            when (type) {
+            when (val type = jp.nextTextValue()) {
                 ReqCmd.LABEL -> {
                     val subId = jp.nextTextValue()
                     val filters = mutableListOf<Filter>()