1 files changed, 8 insertions, 2 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
index d053b8af80..902de08d3f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
@@ -124,12 +124,18 @@ public class AMQMessageDelegate_0_8 implements AMQMessageDelegate
 
     public void setJMSMessageID(String messageId) throws JMSException
     {
-        getContentHeaderProperties().setMessageId(messageId);
+        if (messageId != null)
+        {
+            getContentHeaderProperties().setMessageId(messageId);
+        }
     }
 
     public void setJMSMessageID(UUID messageId) throws JMSException
     {
-        getContentHeaderProperties().setMessageId("ID:" + messageId);
+        if (messageId != null)
+        {
+            getContentHeaderProperties().setMessageId("ID:" + messageId);
+        }
     }