diff --git a/js/core.js b/js/core.js
index eb38c01f..d031cbae 100644
--- a/js/core.js
+++ b/js/core.js
@@ -2,7 +2,7 @@
  * Version: 1.2
  * Author: Jiiks | http://jiiks.net
  * Date: 27/08/2015 - 16:36
- * Last Update: 29/08/2015 - 11:48
+ * Last Update: 29/08/2015 - 22:00
  * https://github.com/Jiiks/BetterDiscordApp
  */
 
@@ -63,19 +63,15 @@ Core.prototype.init = function() {
     this.initSettings();
     this.initObserver();
 
-    //Temp timeout, defer
-    setTimeout(function() {
+    //Settings button
+    $(".guilds li:first-child").after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button", style: 'background-image:url("https://a96edc24045943bce10e086d4fdfb287582825b6.googledrive.com/host/0B4q1DpUVMKCofkgwdTRpWkxYdVhhdEdDYXdFa2V3eWJvbUJ5bHM3dHFDM21taHJJem5JaUU/settings_icon.png")' })))));
 
-        //Settings button
-        $(".guilds li:first-child").after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button", style: 'background-image:url("https://a96edc24045943bce10e086d4fdfb287582825b6.googledrive.com/host/0B4q1DpUVMKCofkgwdTRpWkxYdVhhdEdDYXdFa2V3eWJvbUJ5bHM3dHFDM21taHJJem5JaUU/settings_icon.png")' })))));
+    settingsPanel = new SettingsPanel();
+    settingsPanel.init();
+    quickEmoteMenu.init(false);
 
-        settingsPanel = new SettingsPanel();
-        settingsPanel.init();
-        quickEmoteMenu.init(false);
+    $("#tc-settings-button").on("click", function(e) { settingsPanel.show(); });
 
-        $("#tc-settings-button").on("click", function(e) { settingsPanel.show(); });
-
-    }, 3000);
 
 }
 
@@ -109,10 +105,11 @@ Core.prototype.initObserver = function() {
 
     mainObserver = new MutationObserver(function(mutations) {
         mutations.forEach(function(mutation) {
-            if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
-                quickEmoteMenu.obsCallback();
+            if(mutation.target.getAttribute('class') != null) {
+                if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
+                    quickEmoteMenu.obsCallback();
+                }
             }
-
             emoteModule.obsCallback(mutation);
 
         });
diff --git a/js/main.js b/js/main.js
index 79210275..9b9f92e2 100644
--- a/js/main.js
+++ b/js/main.js
@@ -2,7 +2,7 @@
  * Version: 1.2
  * Author: Jiiks | http://jiiks.net
  * Date: 27/08/2015 - 16:36
- * Last Update: 29/08/2015 - 11:48
+ * Last Update: 29/08/2015 - 22:00
  * https://github.com/Jiiks/BetterDiscordApp
  */
 
@@ -63,19 +63,15 @@ Core.prototype.init = function() {
     this.initSettings();
     this.initObserver();
 
-    //Temp timeout, defer
-    setTimeout(function() {
+    //Settings button
+    $(".guilds li:first-child").after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button", style: 'background-image:url("https://a96edc24045943bce10e086d4fdfb287582825b6.googledrive.com/host/0B4q1DpUVMKCofkgwdTRpWkxYdVhhdEdDYXdFa2V3eWJvbUJ5bHM3dHFDM21taHJJem5JaUU/settings_icon.png")' })))));
 
-        //Settings button
-        $(".guilds li:first-child").after($("<li/>", {id:"tc-settings-li"}).append($("<div/>", { class: "guild-inner" }).append($("<a/>").append($("<div/>", { class: "avatar-small", id: "tc-settings-button", style: 'background-image:url("https://a96edc24045943bce10e086d4fdfb287582825b6.googledrive.com/host/0B4q1DpUVMKCofkgwdTRpWkxYdVhhdEdDYXdFa2V3eWJvbUJ5bHM3dHFDM21taHJJem5JaUU/settings_icon.png")' })))));
+    settingsPanel = new SettingsPanel();
+    settingsPanel.init();
+    quickEmoteMenu.init(false);
 
-        settingsPanel = new SettingsPanel();
-        settingsPanel.init();
-        quickEmoteMenu.init(false);
+    $("#tc-settings-button").on("click", function(e) { settingsPanel.show(); });
 
-        $("#tc-settings-button").on("click", function(e) { settingsPanel.show(); });
-
-    }, 3000);
 
 }
 
@@ -109,10 +105,11 @@ Core.prototype.initObserver = function() {
 
     mainObserver = new MutationObserver(function(mutations) {
         mutations.forEach(function(mutation) {
-            if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
-                quickEmoteMenu.obsCallback();
+            if(mutation.target.getAttribute('class') != null) {
+                if(mutation.target.getAttribute('class').indexOf("titlebar") != -1) {
+                    quickEmoteMenu.obsCallback();
+                }
             }
-
             emoteModule.obsCallback(mutation);
 
         });