diff --git a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
index 6df6363413bc6070883db9e0570ccc60338a3699..47394485253065f41a43007c4a859b98d23486e6 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/LauncherActivity.java
@@ -188,8 +188,9 @@ public class LauncherActivity extends Activity implements Reloadable {
     protected void onStart() {
         super.onStart();
 
-        if (openKeyboardOnStart)
+        if (ui != null && openKeyboardOnStart) {
             ui.onStart();
+        }
     }
 
     @Override
@@ -213,13 +214,16 @@ public class LauncherActivity extends Activity implements Reloadable {
     protected void onDestroy() {
         super.onDestroy();
 
-        main.destroy();
+        if(main != null) {
+            main.destroy();
+        }
     }
 
     @Override
     public void onBackPressed() {
-        if (main != null)
+        if (main != null) {
             main.onBackPressed();
+        }
     }
 
     @Override
diff --git a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
index d231bc85043165e99ab145bb06e20260dbdf0985..22f5848404283da96a7134affd04819765d63457 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/tuils/Tuils.java
@@ -379,12 +379,18 @@ public class Tuils {
         return true;
     }
 
-    public static String trimSpaces(String s) {
-        while (s.startsWith(SPACE))
-            s = s.substring(1);
-        while (s.endsWith(SPACE))
-            s = s.substring(0, s.length() - 1);
-        return s;
+    public static CharSequence trimWhitespaces(CharSequence source) {
+
+        if(source == null)
+            return "";
+
+        int i = source.length();
+
+        // loop back to the first non-whitespace character
+        while(--i >= 0 && Character.isWhitespace(source.charAt(i))) {
+        }
+
+        return source.subSequence(0, i+1);
     }
 
     public static String getSDK() {