diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java index 9a4bba92952..32ad75ec3bc 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java @@ -59,7 +59,9 @@ public void uncaughtException(Thread thread, Throwable ex) { Logger.getLogger().e("An error occurred in the uncaught exception handler", e); } finally { Logger.getLogger().d("Completed exception processing. Invoking default exception handler."); - defaultHandler.uncaughtException(thread, ex); + if (defaultHandler != null) { + defaultHandler.uncaughtException(thread, ex); + } isHandlingException.set(false); } }