diff --git a/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt b/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt
index 77d1c6fb8..761423761 100644
--- a/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt
+++ b/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt
@@ -140,6 +140,9 @@ class SavegameCracker(
                     sendout()
                     mode = 39
                 }
+                else if (c == ' ') {
+                    sendout()
+                }
                 else
                     sb.append(c)
             }
@@ -228,6 +231,8 @@ class SavegameCracker(
             val id0 = args[1].toLong(10)
             val id1 = args[2].toLong(10)
 
+            if (it.entries.containsKey(id1)) throw IllegalArgumentException("Entry ID $id1 already exists")
+
             val entry = it.entries.remove(id0)!!
             entry.entryID = id1
             it.entries[id1] = entry