diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
index d8461cc2..2f21ac66 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
@@ -77,11 +77,12 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         // Enable for release builds and debug builds done by Travis
-        final boolean enableCrashHandler =
-                BuildConfig.BUILD_TYPE.equals("release")
-                || BuildConfig.VERSION_NAME.contains("-dev");
+        final boolean enableCrashHandler = BuildConfig.BUILD_TYPE.equals("release")
+                || BuildConfig.BUILD_TYPE.equals("debug");
+
         CaocConfig.Builder.create()
                 .enabled(enableCrashHandler)
+                .trackActivities(true)
                 .apply();
 
         setContentView(R.layout.activity_main);
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index b161ad11..2b62a822 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -197,7 +197,7 @@
     <string name="info_step_on_scale">Please step barefoot on the scale for reference measurements.</string>
     <string name="info_measuring">Measuring weight: %.2f</string>
 
-    <string name="customactivityoncrash_error_activity_error_occurred_explanation">An unexpected error occurred.\n\nPlease create a new issue on\nhttps://github.com/oliexdev/openScale/issues\n\nInclude the error details.</string>
+    <string name="customactivityoncrash_error_activity_error_occurred_explanation">An unexpected error occurred.\n\nPlease create a new issue including the detailed error details on\nhttps://github.com/oliexdev/openScale/issues</string>
     <string name="customactivityoncrash_error_activity_restart_app">Restart app</string>
     <string name="customactivityoncrash_error_activity_close_app">Close app</string>
     <string name="customactivityoncrash_error_activity_error_details">Error details</string>