Added entity drops control
Throw the right exception and get rid of the preInit method