diff --git a/websocket-sharp/Net/HttpConnection.cs b/websocket-sharp/Net/HttpConnection.cs
index d2aa9fe9..e0fa5f32 100644
--- a/websocket-sharp/Net/HttpConnection.cs
+++ b/websocket-sharp/Net/HttpConnection.cs
@@ -307,10 +307,10 @@ namespace WebSocketSharp.Net
         var len = (int) conn._requestBuffer.Length;
 
         if (conn.processInput (conn._requestBuffer.GetBuffer (), len)) {
-          if (!conn._context.HasError)
+          if (!conn._context.HasErrorMessage)
             conn._context.Request.FinishInitialization ();
 
-          if (conn._context.HasError) {
+          if (conn._context.HasErrorMessage) {
             conn._context.SendError ();
 
             return;
@@ -398,7 +398,7 @@ namespace WebSocketSharp.Net
             _context.Request.AddHeader (line);
           }
 
-          if (_context.HasError)
+          if (_context.HasErrorMessage)
             return true;
         }
       }
diff --git a/websocket-sharp/Net/HttpListenerContext.cs b/websocket-sharp/Net/HttpListenerContext.cs
index 021e3aaa..aaf3ae59 100644
--- a/websocket-sharp/Net/HttpListenerContext.cs
+++ b/websocket-sharp/Net/HttpListenerContext.cs
@@ -106,7 +106,7 @@ namespace WebSocketSharp.Net
       }
     }
 
-    internal bool HasError {
+    internal bool HasErrorMessage {
       get {
         return _errorMessage != null;
       }