diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java b/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java
index 84f9184..c4cf4eb 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java
@@ -74,7 +74,7 @@ public class TraceManager {
         }
         int frameID = trace.getFrameID();
         ShowManager.traceRemove(id);
-        frameMap.get(frameID).remove((Integer) id);
+        if (frameMap.containsKey(frameID)) frameMap.get(frameID).remove((Integer) id);
         testRemoveFrame(frameID);
     }
 }