#42 Fix Findbugs: Redundant Nullcheck
Merge branch '42-fix-findbugs-redundant-nullcheck'