diff --git a/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java b/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
index 87eca8a..6508ca7 100644
--- a/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
+++ b/framework/src/main/java/de/arcus/framework/crashhandler/CrashHandler.java
@@ -76,11 +76,18 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
         logBuilder.append("Manufacturer: ").append(Build.MANUFACTURER).append("\n");
         logBuilder.append("Model: ").append(Build.MODEL).append("\n");
         logBuilder.append("Device API: ").append(Build.VERSION.RELEASE).append("\n");
+        logBuilder.append("Product: ").append(Build.PRODUCT).append("\n");
+        logBuilder.append("Build Number: ").append(Build.DISPLAY).append("\n");
+        logBuilder.append("Build Tags: ").append(Build.TAGS).append("\n");
+        logBuilder.append("\n");
+
 
         // Information
         logBuilder.append("---------- Information -----------\n");
         logBuilder.append("PackageName: ").append(mActivity.getPackageName()).append("\n");
         logBuilder.append("Crashed activity: ").append(mActivity.getLocalClassName()).append("\n");
+        logBuilder.append("\n");
+
 
         logBuilder.append("----------- Exception ------------\n");
         logBuilder.append(ex.getMessage()).append("\n");
diff --git a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java
index faa4ca2..c58c676 100644
--- a/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java
+++ b/playmusicexporter/src/main/java/re/jcg/playmusicexporter/activities/SettingsActivity.java
@@ -325,13 +325,12 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             addPreferencesFromResource(R.xml.pref_debug);
             setHasOptionsMenu(true);
 
-            findPreference("debug_trigger_export_all").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    Log.i(TAG, "Debug Trigger Export All Click registered.");
-                    ExportAllService.startExport(getActivity());
-                    return true;
-                }
+            findPreference("debug_trigger_export_all").setOnPreferenceClickListener(preference -> {
+                ExportAllService.startExport(getActivity());
+                return true;
+            });
+            findPreference("debug_test_crash_handler").setOnPreferenceClickListener(preference -> {
+                throw new IllegalStateException("Test for the crash handler.");
             });
         }
 
diff --git a/playmusicexporter/src/main/res/values-de/strings.xml b/playmusicexporter/src/main/res/values-de/strings.xml
index 14498df..5feb8ac 100644
--- a/playmusicexporter/src/main/res/values-de/strings.xml
+++ b/playmusicexporter/src/main/res/values-de/strings.xml
@@ -108,4 +108,5 @@
     <string name="overwrite_title">Bestehende Dateien überschreiben</string>
 	<string name="action_refesh">Datenbank neu laden</string>
 	<string name="database_reloaded">Datenbank neu geladen</string>
+    <string name="debug_test_crash_handler">Teste Fehlerbehandlung</string>
 </resources>
\ No newline at end of file
diff --git a/playmusicexporter/src/main/res/values/strings.xml b/playmusicexporter/src/main/res/values/strings.xml
index 66aa76e..7b8763c 100644
--- a/playmusicexporter/src/main/res/values/strings.xml
+++ b/playmusicexporter/src/main/res/values/strings.xml
@@ -148,4 +148,5 @@
     <string name="overwrite_title">Overwrite Existing Files</string>
     <string name="action_refesh">Refresh</string>
     <string name="database_reloaded">Music Database Reloaded</string>
+    <string name="debug_test_crash_handler">Test Crash Handler</string>
 </resources>
diff --git a/playmusicexporter/src/main/res/xml/pref_debug.xml b/playmusicexporter/src/main/res/xml/pref_debug.xml
index ea57311..d147b4a 100644
--- a/playmusicexporter/src/main/res/xml/pref_debug.xml
+++ b/playmusicexporter/src/main/res/xml/pref_debug.xml
@@ -2,5 +2,7 @@
     <PreferenceCategory android:title="@string/settings_category_debug">
         <Preference android:title="@string/debug_trigger_export_all_title"
             android:key="debug_trigger_export_all"/>
+        <Preference android:title="@string/debug_test_crash_handler"
+            android:key="debug_test_crash_handler"/>
     </PreferenceCategory>
 </PreferenceScreen>