diff --git a/app/build.gradle b/app/build.gradle
index 74bfe7801272576f49f598119c7b4fbfe6a7e96e..8885ed749b0b22da9b405bb1c6f8e4a3f0d0deff 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 23
 
-        versionCode 121
+        versionCode 122
         versionName "6.2b"
     }
 
diff --git a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
index 7ab4b630d657fa292b0b24984845bbfdf8ca25f8..d0e9bb37a2ae4adaf31e0ceadcbf3b6492b4f6ad 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/MainManager.java
@@ -346,29 +346,21 @@ public class MainManager {
         @Override
         public boolean trigger(final ExecutePack info, final String input) throws Exception {
 
-            final boolean[] returnValue = new boolean[1];
+            final Command command = CommandTuils.parse(input, info, false);
+            if(command == null) return false;
+
+            mainPack.lastCommand = input;
 
             new StoppableThread() {
                 @Override
                 public void run() {
                     super.run();
 
-                    mainPack.lastCommand = input;
-
                     try {
-                        Command command = CommandTuils.parse(input, info, false);
+                        String output = command.exec(mContext.getResources(), info);
 
-                        synchronized (returnValue) {
-                            returnValue[0] = command != null;
-                            returnValue.notify();
-                        }
-
-                        if (command != null) {
-                            String output = command.exec(mContext.getResources(), info);
-
-                            if(output != null) {
-                                out.onOutput(output);
-                            }
+                        if(output != null) {
+                            out.onOutput(output);
                         }
                     } catch (Exception e) {
                         out.onOutput(Tuils.getStackTrace(e));
@@ -377,10 +369,7 @@ public class MainManager {
                 }
             }.start();
 
-            synchronized (returnValue) {
-                returnValue.wait();
-                return returnValue[0];
-            }
+            return true;
         }
     }
 }
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/music/MusicService.java b/app/src/main/java/ohi/andre/consolelauncher/managers/music/MusicService.java
index f01971b776cb193ca8b7e87400424ff1b2ee23e6..e5769a61b207a7af3eff12c905f86592f6f1ae12 100644
--- a/app/src/main/java/ohi/andre/consolelauncher/managers/music/MusicService.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/managers/music/MusicService.java
@@ -189,8 +189,14 @@ public class MusicService extends Service implements
     }
 
     public void stop() {
-        player.stop();
-        player.release();
+        try {
+            player.stop();
+        } catch (Exception e) {}
+
+        try {
+            player.release();
+        } catch (Exception e) {}
+
         setSong(0);
     }
 
diff --git a/app/src/main/java/ohi/andre/consolelauncher/managers/notifications/NotificationManager.java b/app/src/main/java/ohi/andre/consolelauncher/managers/notifications/NotificationManager.java
index 8b3dcf22e806674c28cceb618125f91c4f4006b3..e043b6e6b17ccb7926b56ef49d84b765d890b903 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/managers/notifications/NotificationManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/managers/notifications/NotificationManager.java
@@ -67,13 +67,13 @@ public class NotificationManager implements XMLPrefsManager.XmlPrefsElement {
                 return "false";
             }
         },
-        default_app_state {
+        app_notification_enabled_default {
             @Override
             public String defaultValue() {
                 return "true";
             }
         },
-        default_color {
+        default_notification_color {
             @Override
             public String defaultValue() {
                 return "#00FF00";
@@ -104,7 +104,7 @@ public class NotificationManager implements XMLPrefsManager.XmlPrefsElement {
 
     @Override
     public String[] deleted() {
-        return new String[] {"enabled"};
+        return new String[] {"enabled", "default_color", "default_app_state"};
     }
 
     @Override
@@ -281,8 +281,8 @@ public class NotificationManager implements XMLPrefsManager.XmlPrefsElement {
             Tuils.toFile(e);
         }
 
-        default_app_state = XMLPrefsManager.get(boolean.class, Options.default_app_state);
-        default_color = XMLPrefsManager.get(String.class, Options.default_color);
+        default_app_state = XMLPrefsManager.get(boolean.class, Options.app_notification_enabled_default);
+        default_color = XMLPrefsManager.get(String.class, Options.default_notification_color);
 
         Out:
         for(int count = 0; count < applies.size(); count++) {