--- a/jdk/test/com/sun/net/httpserver/Test3.java	Thu Jun 25 17:01:56 2009 -0400
+++ b/jdk/test/com/sun/net/httpserver/Test3.java	Mon Jun 29 13:10:33 2009 +0100
@@ -62,8 +62,10 @@
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }