diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java
index f740f7c01ce13..b0451b7ad2eab 100644
--- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java
@@ -107,7 +107,7 @@ public class SuggestionController {
         } catch (NullPointerException e) {
             Log.w(TAG, "mRemote service detached before able to query", e);
             return null;
-        } catch (RemoteException e) {
+        } catch (RemoteException | RuntimeException e) {
             Log.w(TAG, "Error when calling getSuggestion()", e);
             return null;
         }
@@ -120,7 +120,7 @@ public class SuggestionController {
         }
         try {
             mRemoteService.dismissSuggestion(suggestion);
-        } catch (RemoteException e) {
+        } catch (RemoteException | RuntimeException e) {
             Log.w(TAG, "Error when calling dismissSuggestion()", e);
         }
     }
@@ -133,7 +133,7 @@ public class SuggestionController {
 
         try {
             mRemoteService.launchSuggestion(suggestion);
-        } catch (RemoteException e) {
+        } catch (RemoteException | RuntimeException e) {
             Log.w(TAG, "Error when calling launchSuggestion()", e);
         }
     }