diff --git a/public/src/app.js b/public/src/app.js
index d13a6004ab..c2c1f179f0 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -187,21 +187,15 @@ app.cacheBuster = null;
 	};
 
 	function highlightNavigationLink() {
-		var path = window.location.pathname,
-			parts = path.split('/'),
-			active = parts[parts.length - 1];
-
+		var path = window.location.pathname;
 		$('#main-nav li').removeClass('active');
-		if (active) {
+		if (path) {
 			$('#main-nav li a').each(function () {
 				var href = $(this).attr('href');
-				if (active === "sort-posts" || active === "sort-reputation" || active === "search" || active === "latest" || active === "online") {
-					active = 'users';
-				}
 
-				if (href && href.match(active)) {
+				if (href && path.startsWith(href)) {
 					$(this.parentNode).addClass('active');
-					return false;
+				 	return false;
 				}
 			});
 		}
diff --git a/public/src/client/search.js b/public/src/client/search.js
index e46a709e74..027f76ca18 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -117,14 +117,18 @@ define('forum/search', ['search', 'autocomplete'], function(searchModule, autoco
 			return;
 		}
 
-		var regexStr = searchQuery.trim().split(' ').join('|');
-		var regex = new RegExp('(' + regexStr + ')', 'gi');
+		try {
+			var regexStr = searchQuery.trim().split(' ').join('|');
+			var regex = new RegExp('(' + regexStr + ')', 'gi');
 
-		$('.search-result-text').each(function() {
-			var result = $(this);
-			var text = result.html().replace(regex, '<strong>$1</strong>');
-			result.html(text).find('img').addClass('img-responsive');
-		});
+			$('.search-result-text').each(function() {
+				var result = $(this);
+				var text = result.html().replace(regex, '<strong>$1</strong>');
+				result.html(text).find('img').addClass('img-responsive');
+			});
+		} catch(e) {
+			return;
+		}
 	}
 
 	function handleSavePreferences() {