More robust game ending

Prevents hanging in states upon game over