NPE in ConnectorWorkItem when using source hints

When using a source general source hint in a query that uses multple sources, I get an NPE:

java.lang.NullPointerException
at org.teiid.dqp.internal.datamgr.ConnectorWorkItem.<init>(ConnectorWorkItem.java:141)
at org.teiid.dqp.internal.datamgr.ConnectorManager.registerRequest(ConnectorManager.java:203)
at org.teiid.dqp.internal.process.DataTierManagerImpl.registerRequest(DataTierManagerImpl.java:966)
at org.teiid.query.tempdata.TempTableDataManager.registerRequest(TempTableDataManager.java:179)
at org.teiid.query.processor.relational.AccessNode.registerRequest(AccessNode.java:475)
at org.teiid.query.processor.relational.AccessNode.open(AccessNode.java:248)
at org.teiid.query.processor.relational.JoinStrategy.openLeft(JoinStrategy.java:95)
at org.teiid.query.processor.relational.JoinNode.open(JoinNode.java:145)
at org.teiid.query.processor.relational.RelationalNode.open(RelationalNode.java:254)
at org.teiid.query.processor.relational.JoinStrategy.openLeft(JoinStrategy.java:95)
at org.teiid.query.processor.relational.JoinNode.open(JoinNode.java:145)
at org.teiid.query.processor.relational.JoinStrategy.openLeft(JoinStrategy.java:95)
at org.teiid.query.processor.relational.JoinNode.open(JoinNode.java:145)
at org.teiid.query.processor.relational.JoinStrategy.openLeft(JoinStrategy.java:95)
at org.teiid.query.processor.relational.JoinNode.open(JoinNode.java:145)
at org.teiid.query.processor.relational.RelationalNode.open(RelationalNode.java:254)
at org.teiid.query.processor.relational.RelationalNode.open(RelationalNode.java:254)
at org.teiid.query.processor.relational.RelationalPlan.open(RelationalPlan.java:136)
at org.teiid.query.processor.QueryProcessor.init(QueryProcessor.java:231)
at org.teiid.query.processor.QueryProcessor.nextBatchDirect(QueryProcessor.java:138)
at org.teiid.query.processor.QueryProcessor.nextBatch(QueryProcessor.java:114)
at org.teiid.query.processor.BatchCollector.collectTuples(BatchCollector.java:164)
at org.teiid.query.processor.BatchCollector.collectTuples(BatchCollector.java:146)
at org.teiid.dqp.internal.process.RequestWorkItem.processMore(RequestWorkItem.java:457)
at org.teiid.dqp.internal.process.RequestWorkItem.process(RequestWorkItem.java:339)
at org.teiid.dqp.internal.process.AbstractWorkItem.run(AbstractWorkItem.java:51)
at org.teiid.dqp.internal.process.RequestWorkItem.run(RequestWorkItem.java:267)
at org.teiid.dqp.internal.process.DQPCore.executeRequest(DQPCore.java:298)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:483)
at org.teiid.transport.LocalServerConnection$1$1.call(LocalServerConnection.java:175)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at org.teiid.dqp.internal.process.DQPWorkContext.runInContext(DQPWorkContext.java:276)
at org.teiid.dqp.internal.process.DQPWorkContext.runInContext(DQPWorkContext.java:260)
at org.teiid.transport.LocalServerConnection$1.invoke(LocalServerConnection.java:173)
at com.sun.proxy.$Proxy14.executeRequest(Unknown Source)
at org.teiid.jdbc.StatementImpl.execute(StatementImpl.java:661)
at org.teiid.jdbc.StatementImpl.executeSql(StatementImpl.java:527)
at org.teiid.jdbc.PreparedStatementImpl.executeQuery(PreparedStatementImpl.java:261)