Fix for NullPointerException in case of concurrent query creation

[otemnov]

Sorry for tests absent, but issue is simple: say multiple threads at same time trying to delete an entity of same type. Or even different types.