diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 19fb20f1..d2a59883 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -953,19 +953,20 @@ namespace WebSocketSharp
           return false;
         }
 
-        _readyState = WebSocketState.Connecting;
         try {
-          if (doHandshake ()) {
-            _readyState = WebSocketState.Open;
-            return true;
-          }
+          _readyState = WebSocketState.Connecting;
+          if (!doHandshake ())
+            return false;
+
+          _readyState = WebSocketState.Open;
+          return true;
         }
         catch (Exception ex) {
           _logger.Fatal (ex.ToString ());
           fatal ("An exception has occurred while connecting.", ex);
-        }
 
-        return false;
+          return false;
+        }
       }
     }