diff --git a/src/RestSharp/RestRequest.cs b/src/RestSharp/RestRequest.cs
index 16c490a40..fdf0c2807 100644
--- a/src/RestSharp/RestRequest.cs
+++ b/src/RestSharp/RestRequest.cs
@@ -92,6 +92,11 @@ static IEnumerable<NameValuePair> ParseQuery(string query)
                     .Select(
                         x =>
                         {
+                            if (x == string.Empty)
+                                throw new ArgumentException(
+                                    "resource contains an invalid query."
+                                );
+                            
                             var position = x.IndexOf('=');
 
                             return position > 0