Index: modules/awt/src/main/java/common/java/awt/image/BufferedImage.java =================================================================== --- modules/awt/src/main/java/common/java/awt/image/BufferedImage.java (revision 449668) +++ modules/awt/src/main/java/common/java/awt/image/BufferedImage.java (working copy) @@ -368,7 +368,7 @@ throw new NullPointerException("Property name is null"); } if (properties == null) { - return null; + return Image.UndefinedProperty; } Object property = properties.get(name); if (property == null) {