Fixed NPE
Merge branch 'master' of github.com:RothschildGames/o11