Attempt to fix NPE when saving games