diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java
index 702c20d6..b661a982 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java
@@ -251,7 +251,8 @@ public abstract class NanoHTTPD
         try
         {
             safeClose(myServerSocket);
-            myThread.join();
+            //This should prevent a null pointer :)
+            if (myThread != null) myThread.join();
         }
         catch (Exception e)
         {