diff --git a/websocket-sharp/Net/HttpUtility.cs b/websocket-sharp/Net/HttpUtility.cs
index 407c0664..1087a90e 100644
--- a/websocket-sharp/Net/HttpUtility.cs
+++ b/websocket-sharp/Net/HttpUtility.cs
@@ -1161,8 +1161,11 @@ namespace WebSocketSharp.Net
 
     public static byte[] UrlEncodeToBytes (byte[] bytes)
     {
-      int len;
-      return bytes != null && (len = bytes.Length) > 0
+      if (bytes == null)
+        return null;
+
+      var len = bytes.Length;
+      return len > 0
              ? InternalUrlEncodeToBytes (bytes, 0, len)
              : bytes;
     }