diff --git a/wifi/java/android/net/wifi/nan/WifiNanManager.java b/wifi/java/android/net/wifi/nan/WifiNanManager.java
index 8a499d34094e2..e4781c7be3a63 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanManager.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanManager.java
@@ -257,7 +257,7 @@ public class WifiNanManager {
         try {
             mService.enableUsage();
         } catch (RemoteException e) {
-            e.rethrowAsRuntimeException();
+            throw e.rethrowFromSystemServer();
         }
     }
 
@@ -272,7 +272,7 @@ public class WifiNanManager {
         try {
             mService.disableUsage();
         } catch (RemoteException e) {
-            e.rethrowAsRuntimeException();
+            throw e.rethrowFromSystemServer();
         }
     }
 
@@ -286,10 +286,8 @@ public class WifiNanManager {
         try {
             return mService.isUsageEnabled();
         } catch (RemoteException e) {
-            e.rethrowAsRuntimeException();
+            throw e.rethrowFromSystemServer();
         }
-
-        return false;
     }
 
     /**
@@ -578,7 +576,7 @@ public class WifiNanManager {
             rangingKey = mService.startRanging(clientId, sessionId,
                     new RttManager.ParcelableRttParams(params));
         } catch (RemoteException e) {
-            e.rethrowAsRuntimeException();
+            throw e.rethrowFromSystemServer();
         }
 
         synchronized (mLock) {