diff --git a/mithril.js b/mithril.js
index 98480fe0..a94a7be3 100644
--- a/mithril.js
+++ b/mithril.js
@@ -1017,6 +1017,7 @@ var m = (function app(window, undefined) {
 		return str.join("&");
 	}
 	function parseQueryString(str) {
+		if (str === "" || str == null) return {};
 		if (str.charAt(0) === "?") str = str.slice(1);
 
 		var pairs = str.split("&"), params = {};