diff --git a/common/src/main/java/ctbrec/recorder/RecordingManager.java b/common/src/main/java/ctbrec/recorder/RecordingManager.java
index 666ae7ba..5fe9c162 100644
--- a/common/src/main/java/ctbrec/recorder/RecordingManager.java
+++ b/common/src/main/java/ctbrec/recorder/RecordingManager.java
@@ -58,10 +58,10 @@ public class RecordingManager {
     public void saveRecording(Recording rec) throws UnsupportedEncodingException, IOException {
         String json = adapter.toJson(rec);
         File recordingsMetaDir = getDir();
-        Files.createDirectories(recordingsMetaDir.toPath());
         String filename = rec.toString() + ".json";
         File recordingMetaData = new File(recordingsMetaDir, filename);
         rec.setMetaDataFile(recordingMetaData.getAbsolutePath());
+        Files.createDirectories(recordingsMetaDir.toPath());
         Files.write(recordingMetaData.toPath(), json.getBytes("utf-8"), CREATE, WRITE, TRUNCATE_EXISTING);
     }
 
@@ -79,7 +79,7 @@ public class RecordingManager {
                     recordings.add(recording);
                 } else {
                     LOG.info("Recording {} does not exist anymore -> deleting meta data", recording);
-                    Files.deleteIfExists(new File(recording.getMetaDataFile()).toPath());
+                    Files.deleteIfExists(file.toPath());
                 }
             }
         }