diff --git a/jdk/test/com/sun/net/httpserver/Test1.java b/jdk/test/com/sun/net/httpserver/Test1.java
index 9fe314d0756..555102e700e 100644
--- a/jdk/test/com/sun/net/httpserver/Test1.java
+++ b/jdk/test/com/sun/net/httpserver/Test1.java
@@ -86,9 +86,12 @@ public class Test1 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            s1.stop(2);
-            s2.stop(2);
-            executor.shutdown ();
+            if (s1 != null)
+                s1.stop(2);
+            if (s2 != null)
+                s2.stop(2);
+            if (executor != null)
+                executor.shutdown ();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test12.java b/jdk/test/com/sun/net/httpserver/Test12.java
index abf5e9dfbf5..08b41cf768a 100644
--- a/jdk/test/com/sun/net/httpserver/Test12.java
+++ b/jdk/test/com/sun/net/httpserver/Test12.java
@@ -85,9 +85,12 @@ public class Test12 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            s1.stop(2);
-            s2.stop(2);
-            executor.shutdown ();
+            if (s1 != null)
+                s1.stop(2);
+            if (s2 != null)
+                s2.stop(2);
+            if (executor != null)
+                executor.shutdown ();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test13.java b/jdk/test/com/sun/net/httpserver/Test13.java
index 541d8455a00..3f6e1bab0bf 100644
--- a/jdk/test/com/sun/net/httpserver/Test13.java
+++ b/jdk/test/com/sun/net/httpserver/Test13.java
@@ -81,9 +81,12 @@ public class Test13 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            s1.stop(2);
-            s2.stop(2);
-            executor.shutdown ();
+            if (s1 != null)
+                s1.stop(2);
+            if (s2 != null)
+                s2.stop(2);
+            if (executor != null)
+                executor.shutdown ();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test3.java b/jdk/test/com/sun/net/httpserver/Test3.java
index 40a6c9cb446..00bcc52d98d 100644
--- a/jdk/test/com/sun/net/httpserver/Test3.java
+++ b/jdk/test/com/sun/net/httpserver/Test3.java
@@ -62,8 +62,10 @@ public class Test3 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test4.java b/jdk/test/com/sun/net/httpserver/Test4.java
index 2c6c2376807..558bdc33ec2 100644
--- a/jdk/test/com/sun/net/httpserver/Test4.java
+++ b/jdk/test/com/sun/net/httpserver/Test4.java
@@ -60,8 +60,10 @@ public class Test4 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test5.java b/jdk/test/com/sun/net/httpserver/Test5.java
index 7b4891593e4..c7994c97302 100644
--- a/jdk/test/com/sun/net/httpserver/Test5.java
+++ b/jdk/test/com/sun/net/httpserver/Test5.java
@@ -61,8 +61,10 @@ public class Test5 extends Test {
             System.out.println ("OK");
         } finally {
             delay ();
-            server.stop(2);
-            exec.shutdown();
+            if (server != null)
+                server.stop(2);
+            if (exec != null)
+                exec.shutdown();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test9.java b/jdk/test/com/sun/net/httpserver/Test9.java
index 0387bbb06d0..e7678ed9d11 100644
--- a/jdk/test/com/sun/net/httpserver/Test9.java
+++ b/jdk/test/com/sun/net/httpserver/Test9.java
@@ -97,9 +97,12 @@ public class Test9 extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            s1.stop(2);
-            s2.stop(2);
-            executor.shutdown ();
+            if (s1 != null)
+                s1.stop(2);
+            if (s2 != null)
+                s2.stop(2);
+            if (executor != null)
+                executor.shutdown ();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/Test9a.java b/jdk/test/com/sun/net/httpserver/Test9a.java
index 9745f952bd7..2b6411db9b4 100644
--- a/jdk/test/com/sun/net/httpserver/Test9a.java
+++ b/jdk/test/com/sun/net/httpserver/Test9a.java
@@ -92,8 +92,10 @@ public class Test9a extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            server.stop(2);
-            executor.shutdown ();
+            if (server != null)
+                server.stop(2);
+            if (executor != null)
+                executor.shutdown();
         }
     }
 
diff --git a/jdk/test/com/sun/net/httpserver/TestLogging.java b/jdk/test/com/sun/net/httpserver/TestLogging.java
index 5ead8eb83f6..f4e7f7e92f5 100644
--- a/jdk/test/com/sun/net/httpserver/TestLogging.java
+++ b/jdk/test/com/sun/net/httpserver/TestLogging.java
@@ -89,8 +89,10 @@ public class TestLogging extends Test {
             System.out.println ("OK");
         } finally {
             delay();
-            s1.stop(2);
-            executor.shutdown ();
+            if (s1 != null)
+                s1.stop(2);
+            if (executor != null)
+                executor.shutdown();
         }
     }
 }