Fully fix the NPE when accessing entity name for logging after spawning.
Merge branch 'dev'