fixed NPE when world does not yet exist
Merge branch 'master' into stable