diff --git a/src/main/java/info/istlab/ServerTester/WhiteBoardClient.java b/src/main/java/info/istlab/ServerTester/WhiteBoardClient.java
index 229957b..6a6d77c 100644
--- a/src/main/java/info/istlab/ServerTester/WhiteBoardClient.java
+++ b/src/main/java/info/istlab/ServerTester/WhiteBoardClient.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -36,7 +37,8 @@
         // 指定のポートに対して,ソケットを作成します
         // オブジェクトinstrを作り,データ読み出しを準備します
         try {
-            socket = new Socket(address, port);
+            socket = new Socket();
+            socket.connect(new InetSocketAddress(address, port), 1000); // 1秒でタイムアウト
             reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
             writer = new PrintWriter(socket.getOutputStream(), true);
         } catch (Exception e) {
@@ -57,7 +59,7 @@
         thread = new Thread(this);
         thread.start();
 
-        RepaintClient repaintClient = new RepaintClient(this);
+        new RepaintClient(this);
     }
 
     @Override
@@ -149,6 +151,7 @@
                 repaint();
             } catch (IOException e1) {
                 e1.printStackTrace();
+                thread = null;
             }
         }
     }