Index: trunk/modules/beans/src/main/java/java/beans/Encoder.java =================================================================== --- trunk/modules/beans/src/main/java/java/beans/Encoder.java (revision 437989) +++ trunk/modules/beans/src/main/java/java/beans/Encoder.java (working copy) @@ -86,6 +86,8 @@ */ public void setPersistenceDelegate(Class type, PersistenceDelegate persistenceDelegate) { + if (type == null || persistenceDelegate == null) + throw new NullPointerException(); persistenceDelegates.put(type, persistenceDelegate); }