diff --git a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
index 1d4822467af3985f5ba33605b26daaad5fe74f3f..ad27c3a724a2ba891101849f5eddf137a6ee6098 100644
--- a/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
+++ b/common/source/java/ch/systemsx/cisd/common/serviceconversation/ClientMessenger.java
@@ -63,6 +63,13 @@ public class ClientMessenger implements IClientMessenger
             {
                 public void send(ServiceMessage message)
                 {
+                    if (serviceConversationId.equals(message.getConversationId()))
+                    {
+                        throw new IllegalArgumentException(
+                                "Attempt to put in a message for conversation "
+                                        + message.getConversationId()
+                                        + " into queue for conversation " + serviceConversationId);
+                    }
                     if (message.getMessageIdx() <= messageIdxLastSeen)
                     {
                         return;