Fix NPE on game restart. Fixes #60