diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 9e155ad..78bfa73 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -435,8 +435,8 @@ public class BitmessageContext {
                 customCommandHandler = new CustomCommandHandler() {
                     @Override
                     public MessagePayload handle(CustomMessage request) {
-                        throw new IllegalStateException(
-                            "Received custom request, but no custom command handler configured.");
+                        LOG.debug("Received custom request, but no custom command handler configured.");
+                        return null;
                     }
                 };
             }