1 files changed, 11 insertions, 2 deletions
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
index df53c796b2..b1cf23bb9e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
@@ -26,6 +26,7 @@ import java.util.Hashtable;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
+import javax.jms.MessageFormatException;
 
 public class NonQpidMessage implements Message
 {
@@ -278,9 +279,17 @@ public class NonQpidMessage implements Message
             {
                 return (Float) o;
             }
+            else if(o instanceof String)
+            {
+                return Float.valueOf((String)o);
+            }
+            else if(o == null)
+            {
+                throw new NullPointerException("No such property: " + string);
+            }
             else
             {
-                return Float.valueOf(null);
+                throw new MessageFormatException("getFloatProperty(\""+string+"\") failed as value is not a float: " + o);
             }
         }
         else
@@ -300,7 +309,7 @@ public class NonQpidMessage implements Message
             }
             else
             {
-                return Double.valueOf(null);
+                return getFloatProperty(string);
             }
         }
         else