NPE check
Merge branch 'master' of https://github.com/danielsuter/tank-wars