Add more debugging to try and see what is throwing the NPE
Do our own TARDIS world spawn prevention
Fix NPE in manual flight listener