Fix a null pointer exception.
Merge branch 'master' of github.com:EusthEnoptEron/Anzer