diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceListener.java b/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceListener.java
index 772ed8d..be87341 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceListener.java
@@ -40,6 +40,7 @@ public class TraceListener implements Listener {
             TNTTrace trace;
             if (!tntMap.containsKey(tnt)) {
                 trace = TraceManager.createTrace();
+                if (trace == null) return;
                 tntMap.put(tnt, trace);
             } else {
                 trace = tntMap.get(tnt);
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java b/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java
index 43ab8f5..1491610 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/tracer/TraceManager.java
@@ -40,6 +40,7 @@ public class TraceManager {
     }
 
     public static TNTTrace createTrace() {
+        if (!frameMap.containsKey(currentFrame)) return null;
         TNTTrace trace = new TNTTrace(currentFrame);
         int id = generateID();
         traceMap.put(id, trace);