diff --git a/js/legacy/utils/datatype.js b/js/legacy/utils/datatype.js
index 6b0d8fb43b..895d638009 100644
--- a/js/legacy/utils/datatype.js
+++ b/js/legacy/utils/datatype.js
@@ -30,9 +30,8 @@ function fmt_money(v){
 	if(isNaN(v)) {
 		return ''; // not a number
 	} else {
-		var cp = wn.control_panel;
 		var val = 2; // variable used to differentiate other values from Millions
-		if(cp.currency_format == 'Millions') val = 3;
+		if(wn.boot.sysdefaults.currency_format == 'Millions') val = 3;
 		v = v.toFixed(2);
 		var delimiter = ","; // replace comma if desired
 		amount = v+'';
diff --git a/js/wn/views/breadcrumbs.js b/js/wn/views/breadcrumbs.js
index 03cb9804f0..15b93e5d1d 100644
--- a/js/wn/views/breadcrumbs.js
+++ b/js/wn/views/breadcrumbs.js
@@ -3,9 +3,9 @@ wn.views.breadcrumbs = function(parent, module, doctype, name) {
 	$(parent).empty();
 	var $bspan = $(repl('<span class="breadcrumbs">\
 		<a href="#%(home_page)s">Home</a></span>', {home_page: wn.boot.home_page}));
-	if(module) {
+	if(module && wn.modules[module]) {
 		$bspan.append(repl(' / <a href="#!%(module_page)s">%(module)s Home</a>',
-			{module: module, module_page: erpnext.modules[module] }))
+			{module: module, module_page: wn.modules[module] }))
 	}
 	if(doctype && (locals.DocType[doctype] && !locals.DocType[doctype].issingle)) {
 		$bspan.append(repl(' / <a href="#!List/%(doctype)s">%(doctype)s</a>',