diff --git a/lib/request-options.js b/lib/request-options.js
index cb2188d..d993284 100644
--- a/lib/request-options.js
+++ b/lib/request-options.js
@@ -55,13 +55,17 @@ module.exports = function(req, options, limits) {
 
   // If options.originalQuery is true, ignore the above and just
   // use the original raw querystring as the search
+  var originalQuery = "";
+  if (req.url && req.url.indexOf("?") !== -1) {
+    originalQuery = req.url.replace(/^.+\?/, "");
+  }
 
   requestOptions.url = formatUrl(_.extend({
     protocol: parsedUrl.protocol,
     host: parsedUrl.host,
     pathname: pathname
   }, options.originalQuery ?
-    {search: req.url.replace(/^.+\?/, '')} :
+    {search: originalQuery} :
     {query: _.extend({}, querystring.parse(parsedUrl.query), req.query, options.query)}
   ));