diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
index ff1cc69b01f..8299579c758 100644
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -341,6 +341,8 @@ def parse_query_string( query_string ):
     retval = {}
     arguments = query_string.split( '&' )
     for argument in arguments:
+        if '=' not in argument:
+            continue
         key, value = argument.split( '=' )
         retval[ key ] = value
     return retval