I have a CMP app that works great on JBoss 3.2.3. trying to get it to work on 3.2.5, fails during startup. All beans seem to go fine, then I get a NullPointerException. Server.log is as follows:

2004-06-30 07:59:24,783 DEBUG [org.jboss.system.ServiceController] starting service jboss.j2ee:jndiName=CmpEventRequestorHostMap,service=EJB
2004-06-30 07:59:24,783 DEBUG [org.jboss.ejb.EntityContainer] Starting jboss.j2ee:jndiName=CmpEventRequestorHostMap,service=EJB
2004-06-30 07:59:24,783 DEBUG [org.jboss.ejb.EntityContainer] Begin java:comp/env for EJB: CmpEventRequestorHostMap
2004-06-30 07:59:24,783 DEBUG [org.jboss.ejb.EntityContainer] TCL: org.jboss.util.loading.DelegatingClassLoader@17361e2
2004-06-30 07:59:24,783 DEBUG [org.jboss.ejb.EntityContainer] End java:comp/env for EJB: CmpEventRequestorHostMap
2004-06-30 07:59:24,793 DEBUG [org.jboss.ejb.plugins.local.BaseLocalProxyFactory] Bound EJBLocalHome of CmpEventRequestorHostMap to CmpEventRequestorHostMap
2004-06-30 07:59:24,793 DEBUG [org.jboss.ejb.plugins.AbstractInstanceCache] Starting InvalidableEntityInstanceCache...
2004-06-30 07:59:24,793 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager.CmpEventRequestorHostMap] Initializing CMP plugin for CmpEventRequestorHostMap
2004-06-30 07:59:25,204 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCMySQLCreateCommand.CmpEventScoreElement] Insert Entity SQL: INSERT INTO eventscoreelement (eventresultid, parenteventscoreelementid, scorereadertypeid, eventscoreelementtypeid, displayorder, intresult1, intresult2, intresult3, floatresult1, floatresult2, strresult1, strresult2, strresult3, strresult4, strresult5, document, documentmimetype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
2004-06-30 07:59:25,214 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCCommandFactory.CmpEventScoreElement] entity-command: [commandName=mysql-get-generated-keys,commandClass=class org.jboss.ejb.plugins.cmp.jdbc.keygen.JDBCMySQLCreateCommand,attributes={}]
2004-06-30 07:59:25,224 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCRemoveEntityCommand.CmpEventScoreElement] Remove SQL: DELETE FROM eventscoreelement WHERE eventscoreelementid=?
2004-06-30 07:59:25,254 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCStartCommand.CmpEventScoreElement] Table not create as requested: eventscoreelement
2004-06-30 07:59:25,264 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCFindByPrimaryKeyQuery.CmpEventScoreElement#findByPrimaryKey] SQL: SELECT t0_CmpEventScoreElement.eventscoreelementid FROM eventscoreelement t0_CmpEventScoreElement WHERE t0_CmpEventScoreElement.eventscoreelementid=?
2004-06-30 07:59:25,264 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCQueryManager.CmpEventScoreElement] Added findByPrimaryKey query command for local home interface
2004-06-30 07:59:25,264 DEBUG [org.jboss.ejb.plugins.cmp.jdbc.JDBCEJBQLQuery.CmpEventScoreElement#findByEventResultIdAndParentId] EJB-QL: SELECT OBJECT(o) FROM eventscoreelement AS o WHERE o.eventresultid=?1 AND o.parenteventscoreelementid=?2
2004-06-30 07:59:25,264 ERROR [org.jboss.ejb.EntityContainer] Starting failed jboss.j2ee:jndiName=CmpEventRequestorHostMap,service=EJB
java.lang.NullPointerException
at org.jboss.ejb.plugins.cmp.jdbc.JDBCQueryManager.getInstance(JDBCQueryManager.java:88)
at org.jboss.ejb.plugins.cmp.jdbc.JDBCEJBQLQuery.(JDBCEJBQLQuery.java:39)
at org.jboss.ejb.plugins.cmp.jdbc.JDBCCommandFactory.createEJBQLQuery(JDBCCommandFactory.java:60)
at org.jboss.ejb.plugins.cmp.jdbc.JDBCQueryManager.start(JDBCQueryManager.java:266)
at org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager.startStoreManager(JDBCStoreManager.java:498)
at org.jboss.ejb.plugins.cmp.jdbc.JDBCStoreManager.start(JDBCStoreManager.java:396)
at org.jboss.ejb.plugins.CMPPersistenceManager.start(CMPPersistenceManager.java:147)
at org.jboss.ejb.EntityContainer.startService(EntityContainer.java:337)
at org.jboss.system.ServiceMBeanSupport.jbossInternalStart(ServiceMBeanSupport.java:271)
at org.jboss.system.ServiceMBeanSupport.jbossInternalLifecycle(ServiceMBeanSupport.java:221)
at sun.reflect.GeneratedMethodAccessor2.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.jboss.mx.server.ReflectedDispatcher.dispatch(ReflectedDispatcher.java:60)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:61)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:53)
at org.jboss.mx.server.Invocation.invoke(Invocation.java:86)
at org.jboss.mx.server.AbstractMBeanInvoker.invoke(AbstractMBeanInvoker.java:185)
at org.jboss.mx.server.MBeanServerImpl.invoke(MBeanServerImpl.java:473)
at org.jboss.system.ServiceController$ServiceProxy.invoke(ServiceController.java:837)
at $Proxy17.start(Unknown Source)
at org.jboss.system.ServiceController.start(ServiceController.java:367)
at sun.reflect.GeneratedMethodAccessor6.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.jboss.mx.server.ReflectedDispatcher.dispatch(ReflectedDispatcher.java:60)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:61)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:53)
at org.jboss.mx.server.Invocation.invoke(Invocation.java:86)
at org.jboss.mx.server.AbstractMBeanInvoker.invoke(AbstractMBeanInvoker.java:185)
at org.jboss.mx.server.MBeanServerImpl.invoke(MBeanServerImpl.java:473)
at org.jboss.mx.util.MBeanProxyExt.invoke(MBeanProxyExt.java:176)
at $Proxy34.start(Unknown Source)
at org.jboss.ejb.EjbModule.startService(EjbModule.java:367)
at org.jboss.system.ServiceMBeanSupport.jbossInternalStart(ServiceMBeanSupport.java:271)
at org.jboss.system.ServiceMBeanSupport.jbossInternalLifecycle(ServiceMBeanSupport.java:221)
at sun.reflect.GeneratedMethodAccessor2.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.jboss.mx.server.ReflectedDispatcher.dispatch(ReflectedDispatcher.java:60)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:61)
at org.jboss.mx.server.Invocation.dispatch(Invocation.java:53)
at org.jboss.mx.server.Invocation.invoke(Invocation.java:86)
at org.jboss.mx.server.AbstractMBeanInvoker.invoke(AbstractMBeanInvoker.java:185)
at org.jboss.mx.server.MBeanServerImpl.invoke(MBeanServerImpl.java:473)
at org.jboss.system.ServiceController$ServiceProxy.invoke(ServiceController.java:837)
at $Proxy17.start(Unknown Source)
at org.jboss.system.ServiceController.start(ServiceController.java:367)
at sun.reflect.GeneratedMethodAccessor6.invoke(Unknown Source)
.....

I've checked and checked and can find nothing wrong. No other problems on startup. Any ideas?