Make it harder for CupCake.World to crash, fixes #8