diff --git a/code/Server/src/main/scala/net/selenate/server/EntryPoint.scala b/code/Server/src/main/scala/net/selenate/server/EntryPoint.scala
index a9adaff..127d236 100644
--- a/code/Server/src/main/scala/net/selenate/server/EntryPoint.scala
+++ b/code/Server/src/main/scala/net/selenate/server/EntryPoint.scala
@@ -24,6 +24,9 @@ object EntryPoint extends App {
     DriverPool
 
     readLine
+    while(!ActorFactory.system.isTerminated) {
+      Thread.sleep(10000)
+    }
     log.info("Selenate Server now shutting down.")
     ActorFactory.shutdown()
     Runtime.getRuntime.halt(0)