Attempted bugfix (Random nullpointer from GamePanel.render())
Merge