diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index 07c340f5..59e6b3a0 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     implementation 'com.android.support.test:runner:1.0.0'
     implementation 'com.android.support.test:rules:1.0.0'
     annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
+    compile 'cat.ereza:customactivityoncrash:2.2.0'
 }
 
 tasks.withType(Test) {
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 2de60c7c..d8461cc2 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
@@ -45,6 +45,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.health.openscale.BuildConfig;
 import com.health.openscale.R;
 import com.health.openscale.core.OpenScale;
 import com.health.openscale.core.bluetooth.BluetoothCommunication;
@@ -56,6 +57,8 @@ import com.health.openscale.gui.fragments.OverviewFragment;
 import com.health.openscale.gui.fragments.StatisticsFragment;
 import com.health.openscale.gui.fragments.TableFragment;
 
+import cat.ereza.customactivityoncrash.config.CaocConfig;
+
 
 public class MainActivity extends AppCompatActivity {
     private static boolean firstAppStart = true;
@@ -73,6 +76,14 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         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");
+        CaocConfig.Builder.create()
+                .enabled(enableCrashHandler)
+                .apply();
+
         setContentView(R.layout.activity_main);
 
         // Set a Toolbar to replace the ActionBar.
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 4b019798..b161ad11 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -67,7 +67,6 @@
     <string name="label_goal_weight">Goal weight</string>
     <string name="label_goal_date">Goal date</string>
 
-
     <string name="label_title_user">user</string>
     <string name="label_title_last_measurement">last measurement</string>
     <string name="label_title_goal">goal</string>
@@ -198,4 +197,14 @@
     <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_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>
+    <string name="customactivityoncrash_error_activity_error_details_title">Error details</string>
+    <string name="customactivityoncrash_error_activity_error_details_close">Close</string>
+    <string name="customactivityoncrash_error_activity_error_details_copy">Copy to clipboard</string>
+    <string name="customactivityoncrash_error_activity_error_details_copied">Copied to clipboard</string>
+    <string name="customactivityoncrash_error_activity_error_details_clipboard_label">Error information</string>
+
 </resources>