Index: awt/src/main/java/common/java/awt/ToolkitImpl.java =================================================================== --- awt/src/main/java/common/java/awt/ToolkitImpl.java (revision 494382) +++ awt/src/main/java/common/java/awt/ToolkitImpl.java (working copy) @@ -410,7 +410,8 @@ static Image getImage(String filename, Toolkit toolkit) { synchronized (imageCache) { - Image im = imageCache.get(filename); + Image im = (filename == null ? null : imageCache.get(filename)); + if (im == null) { try { im = toolkit.createImage(filename); @@ -418,6 +419,7 @@ } catch (Exception e) { } } + return im; } }