diff of a5f19cbac6500ddb27de4c3aaa0250d8ac443577

a5f19cbac6500ddb27de4c3aaa0250d8ac443577
diff --git a/src/main.lisp b/src/main.lisp
index d41a2df..1dc4aae 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -10,8 +10,11 @@
 (defvar *server* nil)
 
 (defun stop-server ()
-  (hunchentoot:stop *server*)
-  (hunchentoot:stop murja.newui:*server*))
+  (when *server*
+    (hunchentoot:stop *server*))
+  (when (and (find-package 'murja.newui)
+	     murja.newui:*server*)
+    (hunchentoot:stop murja.newui:*server*)))
 
 (defun start-server (&key (port 3010) stream)
   (format t "Starting murja server~%")
@@ -26,7 +29,8 @@
       (setf *server* server))
     
     (hunchentoot:start server)
-    (hunchentoot:start murja.newui:*server*)
+    (when (find-package 'murja.newui)
+      (hunchentoot:start murja.newui:*server*))
     (format t "Started murja server on ~a ~%" port)
     server))
 
diff --git a/test/tests.lisp b/test/tests.lisp
index 66eb3e0..e19f526 100644
--- a/test/tests.lisp
+++ b/test/tests.lisp
@@ -32,7 +32,8 @@
 	(postmodern:execute "DROP SCHEMA IF EXISTS blog CASCADE;")
 	(postmodern:execute "DROP TABLE IF EXISTS public.ragtime_migrations")
 	(postmodern:execute "DROP TABLE IF EXISTS public.migrations_tracker")
-	(hunchentoot:stop *test-server*)
+	(when *test-server*
+	  (hunchentoot:stop *test-server*))
 	(setf *test-server* nil)
 	(setf lisp-fixup:*dev?* nil)
 	(setf murja.middleware.db:*automatic-tests-on?* nil))))