Index: javax/imageio/spi/IIORegistry.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/imageio/spi/IIORegistry.java,v retrieving revision 1.4 diff -u -r1.4 IIORegistry.java --- javax/imageio/spi/IIORegistry.java 11 Jan 2005 22:07:32 -0000 1.4 +++ javax/imageio/spi/IIORegistry.java 26 Mar 2005 16:03:11 -0000 @@ -81,7 +81,9 @@ // XXX: Register built-in Spis here. - ((ClasspathToolkit)Toolkit.getDefaultToolkit()).registerImageIOSpis(this); + Toolkit toolkit = Toolkit.getDefaultToolkit(); + if (toolkit instanceof ClasspathToolkit) + ((ClasspathToolkit)toolkit).registerImageIOSpis(this); registerApplicationClasspathSpis(); }