fixed loading non challenge savegames and another crash

see commit descriptions for more details.
also it says "We can’t automatically merge these branches" even though i fetched the current repo right before patching. wtf is going on here.
i think it is because it tries to reapply the last two commits from you - no idea how to remove those from the pull request.