diff --git a/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java b/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java
index 92dd8dd..c267c1d 100644
--- a/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java
+++ b/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java
@@ -51,7 +51,12 @@ public class CrashDetector {
         while (run) {
             long curTime = System.currentTimeMillis();
             if(curTime - TIMEOUT > lastTick.get()) {
-                SWException.log("Server hung for " + (curTime - lastTick.get()) + "ms", Arrays.stream(mainThread.getStackTrace()).map(StackTraceElement::toString).collect(Collectors.joining("\n")));
+                if(mainThread.isAlive()) {
+                    SWException.log("Server hung for " + (curTime - lastTick.get()) + "ms", Arrays.stream(mainThread.getStackTrace()).map(StackTraceElement::toString).collect(Collectors.joining("\n")));
+                } else {
+                    SWException.log("Server thread already dead, stopping server", "");
+                    System.exit(0);
+                }
                 lastTick.set(curTime);
             }
             try {
diff --git a/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java b/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
index 0f41ff6..35e4277 100644
--- a/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
+++ b/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java
@@ -139,6 +139,7 @@ public class ErrorHandler extends Handler {
         startsWith.add("This version of ViaBackwards does not fully support 1.19 servers.");
         startsWith.add("Biome with id");
         startsWith.add("1.16 and 1.16.1 clients are only partially supported");
+        startsWith.add("Unable to parse CustomName from ");
         ignoreStartsWith = Collections.unmodifiableList(startsWith);
 
         List<String> contains = new ArrayList<>();