diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index c0d6d556..d69998ec 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -520,7 +520,9 @@ public class MicroPhotoService extends Service {
                 try {
                     Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(MicroPhotoContext.PACKAGE_NAME_MPMASTER);
                     // launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    context.startActivity(launchIntent);
+                    if (launchIntent != null) {
+                        context.startActivity(launchIntent);
+                    }
                 } catch (Exception ex) {
                     ex.printStackTrace();
                 }
@@ -1565,7 +1567,7 @@ public class MicroPhotoService extends Service {
 
         String[] params = new String[]{""};
         File workDir = context.getFilesDir();
-        int exitCode = 0;
+        int exitCode = -1;
 
         try {
             Process process = Runtime.getRuntime().exec(cmd, params, workDir.getAbsoluteFile());