diff --git a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
index c2edd64e..83b79b45 100644
--- a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
+++ b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java
@@ -53,7 +53,7 @@ public class ViewportLoading {
             try {
                 TimeUnit.MILLISECONDS.sleep(10);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                throw new Error("Loading thread was interrupted!");
             }
         }
         //add player to viewport realm
@@ -72,7 +72,7 @@ public class ViewportLoading {
             try {
                 TimeUnit.MILLISECONDS.sleep(10);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                throw new Error("Loading thread was interrupted!");
             }
         }
 
diff --git a/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java b/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java
index 7c287153..3be336ad 100644
--- a/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java
+++ b/src/test/java/electrosphere/client/terrain/cells/ClientDrawCellManagerTests.java
@@ -30,6 +30,7 @@ public class ClientDrawCellManagerTests {
         assertDoesNotThrow(() -> {
             new ClientDrawCellManager(null, 64);
         });
+        Main.shutdown();
     }
 
     @UnitTest