diff --git a/src/router/router.js b/src/router/router.js
index e8cfc9b8c..e22b4167b 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -298,11 +298,12 @@
             return _.map(params, function (param, i) {
                 // Don't decode the search params.
                 if (i === params.length - 1) return param || null;
-                var resultParam = param;
+                var resultParam = null;
                 if (param) {
                     try {
                         resultParam = decodeURIComponent(param);
                     } catch (e) {
+                        resultParam = param;
                     }
                 }
                 return resultParam;