bug(minor) : check for null when calling to string on property values.  Fix for CAM-2962