diff --git a/app/build.gradle b/app/build.gradle
index aa4610c2..4fe0326f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,10 @@ android {
         }
         release {
             minifyEnabled true
+            firebaseCrashlytics {
+                mappingFileUploadEnabled false
+            }
+
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             applicationVariants.all { variant ->
                 variant.outputs.all { output ->
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index ef92b7ab..e0fa21a4 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,6 +30,8 @@
 -dontwarn io.realm.**
 -keep class net.pokeranalytics.android.model.** { *; }
 -keep class net.pokeranalytics.android.ui.fragment.** { *; }
+-keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
+-keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
 
 # Retrofit