diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
index e502eb3250..17dcd953cd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryRefreshV2.kt
@@ -123,7 +123,7 @@ object ContactDiscoveryRefreshV2 {
       }
 
       is NetworkResult.NetworkError -> throw result.exception
-      is NetworkResult.ApplicationError -> throw RuntimeException("Unexpected exception", result.throwable)
+      is NetworkResult.ApplicationError -> throw result.throwable
     }
 
     return response.results[e164]?.let { item ->
@@ -213,7 +213,7 @@ object ContactDiscoveryRefreshV2 {
       }
 
       is NetworkResult.NetworkError -> throw result.exception
-      is NetworkResult.ApplicationError -> throw RuntimeException("Unexpected exception", result.throwable)
+      is NetworkResult.ApplicationError -> throw result.throwable
     }
 
     if (!isPartialRefresh && SignalStore.misc.isCdsBlocked) {
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt
index 579abc1986..18ed5f76ac 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt
@@ -72,8 +72,6 @@ class CdsApi(private val authWebSocket: SignalWebSocket.AuthenticatedWebSocket)
             is TimeoutException -> NetworkResult.NetworkError(IOException("Timed out"))
             else -> throw e
           }
-        } catch (e: Exception) {
-          throw RuntimeException("Unexpected exception when retrieving registered users!", e)
         }
       }
   }