Fix for https://github.com/m2e-code-quality/m2e-code-quality/issues/9
Merge pull request #19 from zeilush/master

NPE Fix