From ba7f8461b13c0c486088a2bc781cb2f2d22575dc Mon Sep 17 00:00:00 2001
From: Ruslan Kalbaev <r.s.kalbaev@gmail.com>
Date: Tue, 28 May 2024 18:04:01 +0300
Subject: [PATCH] Add defaultHandler check for null

---
 .../internal/common/CrashlyticsUncaughtExceptionHandler.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
     }
   }