@@ -32,6 +32,16 @@ public ServerHandshakeBuilder onWebsocketHandshakeReceivedAsServer( WebSocket co
 	public void onWebsocketHandshakeReceivedAsClient( WebSocket conn, ClientHandshake request, ServerHandshake response ) throws InvalidDataException {
 	}
 
+	/**
+	 * This default implementation does not do anything which will cause the connections to always progress.
+	 *
+	 * @see org.java_websocket.WebSocketListener#onWebsocketHandshakeReceivedAsClientFailed(WebSocket, ClientHandshake, ServerHandshake)
+	 */
+	@Override
+	public void onWebsocketHandshakeReceivedAsClientFailed( WebSocket conn, ClientHandshake request, ServerHandshake response ) {
+
+	}
+
 	/**
 	 * This default implementation does not do anything which will cause the connections to always progress.
 	 * 
 
@@ -287,6 +287,16 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 						open( handshake );
 						return true;
 					} else {
+						if (handshake.getHttpStatus() != 101) {
+							// if HTTP-status is not 101, let client get a chance to obtain the HTTP response
+							// and take action upon that as per regular HTTP procedures.
+							// (http://tools.ietf.org/html/rfc6455#section-4.1)
+							try {
+								wsl.onWebsocketHandshakeReceivedAsClientFailed(this, handshakerequest, handshake);
+							} catch (RuntimeException e) {
+								// do nothing, fall through and close socket
+							}
+						}
 						close( CloseFrame.PROTOCOL_ERROR, "draft " + draft + " refuses handshake" );
 					}
 				}
 
@@ -50,6 +50,18 @@ public interface WebSocketListener {
 	 */
 	public void onWebsocketHandshakeReceivedAsClient( WebSocket conn, ClientHandshake request, ServerHandshake response ) throws InvalidDataException;
 
+	/**
+	 * Called on the client side when the socket connection is about to be established, but failed due to the handshake
+	 * could not be verified. E.g. the server rejected the request with a regular HTTP response, and the client
+	 * can then use this callback as a way of obtain that HTTP response, e.g. status code.
+	 *
+	 * @param conn     The WebSocket related to this event
+	 * @param request  The handshake initially send out to the server by this websocket.
+	 * @param response The handshake the server sent in response to the request.
+	 */
+	public void onWebsocketHandshakeReceivedAsClientFailed(WebSocket conn, ClientHandshake request, ServerHandshake response);
+
+
 	/**
 	 * Called on the client side when the socket connection is first established, and the WebSocketImpl
 	 * handshake has just been sent.