--- src/com/dumbster/smtp/SimpleSmtpServer.java.sav	2006-09-13 10:42:54.000000000 +0200
+++ src/com/dumbster/smtp/SimpleSmtpServer.java	2006-09-13 10:43:29.000000000 +0200
@@ -145,11 +145,13 @@
   public synchronized void stop() {
     // Mark us closed
     stopped = true;
-    try {
-      // Kick the server accept loop
-      serverSocket.close();
-    } catch (IOException e) {
-      // Ignore
+    if (serverSocket != null) {
+      try {
+        // Kick the server accept loop
+        serverSocket.close();
+      } catch (IOException e) {
+        // Ignore
+      }
     }
   }