diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 4965034423..161eb0c293 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -176,7 +176,9 @@ var ajaxify = {};
 					next(err);
 				});
 			}, function(err) {
-				callback(err);
+				if (callback) {
+					callback(err);
+				}
 			});
 		});
 	};
diff --git a/public/src/templates.js b/public/src/templates.js
index a1d42f0b4c..2331fdf145 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -363,8 +363,7 @@
 	module.exports.__express = module.exports.render;
 
 	if ('undefined' !== typeof window) {
-		window.templates = module.exports;
-		templates.init();
+		window.templates = module.exports;a
 	}
 
 })('undefined' === typeof module ? {