Fix crash when loading a savegame after dying (Fixes #1389)