diff --git a/lib/spring/client/run.rb b/lib/spring/client/run.rb
index c5fe1dd5..422325fe 100644
--- a/lib/spring/client/run.rb
+++ b/lib/spring/client/run.rb
@@ -114,7 +114,16 @@ def stop_server
       end
 
       def verify_server_version
-        server_version = server.gets.chomp
+        unless IO.select([server], [], [], CONNECT_TIMEOUT)
+          raise "Error connecting to Spring server"
+        end
+
+        line = server.gets
+        unless line
+          raise "Error connecting to Spring server"
+        end
+
+        server_version = line.chomp
         if server_version != env.version
           $stderr.puts "There is a version mismatch between the Spring client " \
                          "(#{env.version}) and the server (#{server_version})."