Fixing crash on save game

Author: ammesonb, chickenbellyfinn
Merge branch 'team9dev' into feature-emailnotification