diff --git a/core/src/main/java/bisq/core/dao/node/full/RpcService.java b/core/src/main/java/bisq/core/dao/node/full/RpcService.java
index 9f3c999f02b..2412e4e3564 100644
--- a/core/src/main/java/bisq/core/dao/node/full/RpcService.java
+++ b/core/src/main/java/bisq/core/dao/node/full/RpcService.java
@@ -221,11 +221,11 @@ public void onFailure(@NotNull Throwable throwable) {
             }, MoreExecutors.directExecutor());
         } catch (RejectedExecutionException e) {
             if (!shutdownInProgress) {
-                log.warn(e.toString(), e);
+                log.error(e.toString(), e);
                 throw e;
             }
         } catch (Exception e) {
-            log.warn(e.toString(), e);
+            log.error(e.toString(), e);
             throw e;
         }
     }
@@ -316,11 +316,14 @@ public void onFailure(@NotNull Throwable throwable) {
                     UserThread.execute(() -> errorHandler.accept(throwable));
                 }
             }, MoreExecutors.directExecutor());
-        } catch (Exception e) {
-            if (!shutdownInProgress || !(e instanceof RejectedExecutionException)) {
+        } catch (RejectedExecutionException e) {
+            if (!shutdownInProgress) {
                 log.error("Exception at requestChainHeadHeight", e);
                 throw e;
             }
+        } catch (Exception e) {
+            log.error("Exception at requestChainHeadHeight", e);
+            throw e;
         }
     }
 
@@ -350,12 +353,14 @@ public void onFailure(@NotNull Throwable throwable) {
                     UserThread.execute(() -> errorHandler.accept(throwable));
                 }
             }, MoreExecutors.directExecutor());
-        } catch (Exception e) {
-            log.error("Exception at requestDtoBlock", e);
-            if (!shutdownInProgress || !(e instanceof RejectedExecutionException)) {
-                log.warn(e.toString(), e);
+        } catch (RejectedExecutionException e) {
+            if (!shutdownInProgress) {
+                log.error("Exception at requestDtoBlock", e);
                 throw e;
             }
+        } catch (Exception e) {
+            log.error("Exception at requestDtoBlock", e);
+            throw e;
         }
     }
 
@@ -386,11 +391,14 @@ public void onFailure(@NotNull Throwable throwable) {
                     UserThread.execute(() -> errorHandler.accept(throwable));
                 }
             }, MoreExecutors.directExecutor());
-        } catch (Exception e) {
-            if (!shutdownInProgress || !(e instanceof RejectedExecutionException)) {
-                log.warn(e.toString(), e);
+        } catch (RejectedExecutionException e) {
+            if (!shutdownInProgress) {
+                log.error(e.toString(), e);
                 throw e;
             }
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            throw e;
         }
     }