Check for nil
Merge branch 'master' of github.com:gerjomarty/saimoe2