diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
index ba3c8602c6ff6..6cf9eff1da2f4 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
@@ -82,11 +82,8 @@ public class SystemUIService extends Service {
         mLogBufferFreezer.attach(mBroadcastDispatcher);
 
         // Attempt to dump all LogBuffers for any uncaught exception
-        mUncaughtExceptionPreHandlerManager.registerHandler((thread, throwable) -> {
-            if (throwable instanceof Exception) {
-                mLogBufferEulogizer.record(((Exception) throwable));
-            }
-        });
+        mUncaughtExceptionPreHandlerManager.registerHandler(
+                (thread, throwable) -> mLogBufferEulogizer.record(throwable));
 
         // If configured, set up a battery notification
         if (getResources().getBoolean(R.bool.config_showNotificationForUnknownBatteryState)) {
diff --git a/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt b/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt
index 25b90bebf0d12..bd43302a8bb51 100644
--- a/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt
+++ b/packages/SystemUI/src/com/android/systemui/dump/LogBufferEulogizer.kt
@@ -72,7 +72,7 @@ class LogBufferEulogizer(
      * The file will be prefaced by the [reason], which will then be returned (presumably so it can
      * be thrown).
      */
-    fun <T : Exception> record(reason: T): T {
+    fun <T : Throwable> record(reason: T): T {
         val start = systemClock.uptimeMillis()
         var duration = 0L