1 files changed, 5 insertions, 3 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/FiledTableSupport.java b/java/client/src/main/java/org/apache/qpid/client/message/FiledTableSupport.java
index 9c4aa9e259..3db628017f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/FiledTableSupport.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/FiledTableSupport.java
@@ -12,11 +12,13 @@ public class FiledTableSupport
   public static FieldTable convertToFieldTable(Map<String,?> props)
   {
       FieldTable ft = new FieldTable();
-      for (String key : props.keySet())
+      if (props != null)
       {
-          ft.setObject(key, props.get(key));
+          for (String key : props.keySet())
+          {
+              ft.setObject(key, props.get(key));
+          }
       }
-
       return ft;
   }