diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 0b537bbf34..6d2b00d83b 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -22,8 +22,8 @@ frappe.Application = Class.extend({
 		this.startup();
 	},
 	startup: function() {
-		frappe.model.init();
 		frappe.socket.init();
+		frappe.model.init();
 		this.load_bootinfo();
 		this.make_nav_bar();
 		this.set_favicon();
diff --git a/socketio.js b/socketio.js
index 88ba1c4dcf..da672ad14b 100644
--- a/socketio.js
+++ b/socketio.js
@@ -131,6 +131,7 @@ function get_site_name(socket) {
 }
 
 function get_hostname(url) {
+	if (!url) return undefined;
 	if (url.indexOf("://") > -1) {
         url = url.split('/')[2];
     }