1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/com/orbekk/protobuf/RequestDispatcher.java b/src/main/java/com/orbekk/protobuf/RequestDispatcher.java
index c9f79fb..4399a6e 100644
--- a/src/main/java/com/orbekk/protobuf/RequestDispatcher.java
+++ b/src/main/java/com/orbekk/protobuf/RequestDispatcher.java
@@ -47,6 +47,11 @@ public class RequestDispatcher extends Thread {
         private final RpcCallback<Message> callback =
                 new RpcCallback<Message>() {
             @Override public void run(Message responseMessage) {
+                if (responseMessage == null && rpc.isOk()) {
+                    throw new IllegalStateException(
+                            "responseMessage is null, but rpc is ok:  " +
+                            rpc);
+                }
                 if (responseMessage != null) {
                     response.setResponseProto(responseMessage.toByteString());
                 }