diff --git a/src/main/java/info/istlab/ServerTester/WebServer.java b/src/main/java/info/istlab/ServerTester/WebServer.java
index 23d91c8..93085cf 100644
--- a/src/main/java/info/istlab/ServerTester/WebServer.java
+++ b/src/main/java/info/istlab/ServerTester/WebServer.java
@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Socket;
+import java.net.SocketException;
 
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -31,13 +32,6 @@
     }
 
     public void handleRequest() {
-        if (!serverSocket.isBound()) {
-            try {
-                serverSocket.close();
-            } catch (IOException e) {
-            }
-            return;
-        }
         File rootdir = new File(System.getProperty("user.dir"));
 
         // boolean askDocRoot = true; // ドキュメントルートをユーザが選べるようにする
@@ -70,11 +64,13 @@
         for (File file : files) {
             System.out.println("[Web] " + file.getName());
         }
-        while (serverSocket.isBound()) {
+        while (thread != null) {
             try {
                 Socket socket = serverSocket.accept();
                 // System.out.println("---\nConnection Requst from: " + (socket.getInetAddress()));
                 new RequestHandler(socket, rootdir);
+            } catch(SocketException sx){
+				thread = null;
             } catch (IOException e) {
                 thread = null;
             }