Further fix for rare crash with improperly saved worlds.  Fixes #1254.