diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/chat/signature/command/SignCommandTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/chat/signature/command/SignCommandTest.kt
new file mode 100644
index 000000000..9483728e4
--- /dev/null
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/chat/signature/command/SignCommandTest.kt
@@ -0,0 +1,40 @@
+/*
+ * Minosoft
+ * Copyright (C) 2020-2023 Moritz Zwerger
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.data.chat.signature.command
+
+import de.bixilon.minosoft.commands.nodes.ArgumentNode
+import de.bixilon.minosoft.commands.nodes.LiteralNode
+import de.bixilon.minosoft.commands.parser.minecraft.message.MessageParser
+import de.bixilon.minosoft.commands.stack.CommandStack
+import de.bixilon.minosoft.data.chat.signature.SignatureTestUtil
+import de.bixilon.minosoft.data.chat.signature.signer.DummyMessageSigner
+import de.bixilon.minosoft.protocol.ProtocolUtil.encodeNetwork
+import de.bixilon.minosoft.protocol.network.connection.play.ConnectionTestUtil
+import org.testng.Assert.assertEquals
+import org.testng.annotations.Test
+import java.time.Instant
+
+@Test(groups = ["command", "signature"], dependsOnGroups = ["private_key"])
+class SignCommandTest {
+
+    fun basicTest() {
+        val stack = CommandStack(ConnectionTestUtil.createConnection())
+        stack.push(LiteralNode("unsigned"), "unsigned")
+        stack.push(ArgumentNode("message", MessageParser), "hi there. I am Moritz!")
+
+        val signature = stack.sign(DummyMessageSigner, SignatureTestUtil.key.pair.private, 0L, Instant.MIN)
+        assertEquals(signature.size, 1)
+        assertEquals(signature["message"], "hi there. I am Moritz!".encodeNetwork())
+    }
+}
diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/chat/signature/signer/DummyMessageSigner.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/chat/signature/signer/DummyMessageSigner.kt
new file mode 100644
index 000000000..5f537f98b
--- /dev/null
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/chat/signature/signer/DummyMessageSigner.kt
@@ -0,0 +1,28 @@
+/*
+ * Minosoft
+ * Copyright (C) 2020-2023 Moritz Zwerger
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.data.chat.signature.signer
+
+import de.bixilon.minosoft.data.chat.signature.LastSeenMessageList
+import de.bixilon.minosoft.data.text.ChatComponent
+import de.bixilon.minosoft.protocol.ProtocolUtil.encodeNetwork
+import java.security.PrivateKey
+import java.time.Instant
+import java.util.*
+
+object DummyMessageSigner : MessageSigner {
+
+    override fun signMessage(privateKey: PrivateKey, message: String, preview: ChatComponent?, salt: Long, sender: UUID, time: Instant, lastSeen: LastSeenMessageList): ByteArray {
+        return message.encodeNetwork()
+    }
+}
diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt
index d88be3214..9683f4ab0 100644
--- a/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/registries/versions/PixLyzerLoadingTest.kt
@@ -21,9 +21,8 @@ import de.bixilon.minosoft.protocol.protocol.VersionSupport
 import de.bixilon.minosoft.protocol.versions.Versions
 import de.bixilon.minosoft.test.ITUtil
 import org.testng.Assert
-import org.testng.annotations.Test
 
-@Test(groups = ["pixlyzer"], dependsOnGroups = ["version"], singleThreaded = false, threadPoolSize = 8)
+// @Test(groups = ["pixlyzer"], dependsOnGroups = ["version"], singleThreaded = false, threadPoolSize = 8)
 class PixLyzerLoadingTest {
 
     private fun VersionRegistry.test() {
diff --git a/src/main/java/de/bixilon/minosoft/commands/nodes/ChatNode.kt b/src/main/java/de/bixilon/minosoft/commands/nodes/ChatNode.kt
index 5c2d22841..54b043e5e 100644
--- a/src/main/java/de/bixilon/minosoft/commands/nodes/ChatNode.kt
+++ b/src/main/java/de/bixilon/minosoft/commands/nodes/ChatNode.kt
@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2022 Moritz Zwerger
+ * Copyright (C) 2020-2023 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -31,6 +31,14 @@ class ChatNode(
         val peek = reader.peek()
         val node = getNode(reader, stack)
         val string = parser.parse(reader)
+
+        var thrown: Throwable? = null // throw it after sending ti
+        try {
+            node?.execute(CommandReader(string), stack)
+        } catch (error: Throwable) {
+            thrown = error
+        }
+
         if (node != CLI.ROOT_NODE && string.isNotBlank()) {
             if (peek == '/'.code) {
                 stack.connection.util.sendCommand("/$string", stack)
@@ -38,7 +46,8 @@ class ChatNode(
                 stack.connection.util.sendChatMessage(string)
             }
         }
-        node?.execute(CommandReader(string), stack)
+
+        thrown?.let { throw it }
     }
 
     private fun getNode(reader: CommandReader, stack: CommandStack): RootNode? {
diff --git a/src/main/java/de/bixilon/minosoft/commands/stack/CommandStackEntry.kt b/src/main/java/de/bixilon/minosoft/commands/stack/CommandStackEntry.kt
index ff4602ec4..3544c1b23 100644
--- a/src/main/java/de/bixilon/minosoft/commands/stack/CommandStackEntry.kt
+++ b/src/main/java/de/bixilon/minosoft/commands/stack/CommandStackEntry.kt
@@ -26,6 +26,6 @@ data class CommandStackEntry(
 ) {
 
     fun sign(connection: PlayConnection, signer: MessageSigner, key: PrivateKey, salt: Long, time: Instant): ByteArray {
-        return signer.signMessage(key, data.toString(), null, salt, connection.player.uuid, time, LastSeenMessageList(emptyArray()))
+        return signer.signMessage(key, data.toString(), null, salt, connection.account.uuid, time, LastSeenMessageList(emptyArray()))
     }
 }