Added better error handling for game view