diff --git a/Semesterprojekt/src/main/java/thb/jeanluc/adventure/save/SaveService.java b/Semesterprojekt/src/main/java/thb/jeanluc/adventure/save/SaveService.java
index b4c5b9e..b5cf690 100644
--- a/Semesterprojekt/src/main/java/thb/jeanluc/adventure/save/SaveService.java
+++ b/Semesterprojekt/src/main/java/thb/jeanluc/adventure/save/SaveService.java
@@ -52,7 +52,12 @@ public class SaveService {
             try {
                 Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
             } catch (IOException atomicFailed) {
-                Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING);
+                try {
+                    Files.move(tmp, target, StandardCopyOption.REPLACE_EXISTING);
+                } catch (IOException fallbackFailed) {
+                    Files.deleteIfExists(tmp);
+                    throw fallbackFailed;
+                }
             }
         } catch (IOException e) {
             throw new SaveException("Could not write save '" + session.getSlotName() + "': " + e.getMessage(), e);
diff --git a/Semesterprojekt/src/test/java/thb/jeanluc/adventure/save/SaveServiceTest.java b/Semesterprojekt/src/test/java/thb/jeanluc/adventure/save/SaveServiceTest.java
index 9dcf54e..e321a87 100644
--- a/Semesterprojekt/src/test/java/thb/jeanluc/adventure/save/SaveServiceTest.java
+++ b/Semesterprojekt/src/test/java/thb/jeanluc/adventure/save/SaveServiceTest.java
@@ -45,6 +45,7 @@ class SaveServiceTest {
         List<SaveSlotInfo> slots = svc.list();
         assertThat(slots).hasSize(1);
         assertThat(slots.getFirst().slotName()).isEqualTo("Alpha Run");
+        assertThat(slots.getFirst().slug()).isEqualTo("alpha_run");
         assertThat(slots.getFirst().turn()).isEqualTo(3);
     }
 
@@ -60,4 +61,16 @@ class SaveServiceTest {
         SaveService svc = new SaveService(dir);
         assertThrows(SaveException.class, () -> svc.load("bad"));
     }
+
+    @Test
+    void loadRejectsIncompatibleVersion(@TempDir Path dir) throws Exception {
+        // a syntactically valid SaveData JSON but with a future schemaVersion
+        String json = "{\"schemaVersion\":999,\"worldTitle\":\"X\",\"slotName\":\"v\","
+                + "\"savedAtEpochMillis\":0,\"turn\":0,\"currentRoomId\":\"k\","
+                + "\"visitedRoomIds\":[],\"gold\":0,\"inventoryItemIds\":[],\"flags\":[],"
+                + "\"questStages\":{},\"questCompleted\":[],\"roomItemIds\":{},\"switchStates\":{}}";
+        Files.writeString(dir.resolve("v.json"), json);
+        SaveService svc = new SaveService(dir);
+        assertThrows(SaveException.class, () -> svc.load("v"));
+    }
 }