Resolved a bunch of findbugs issues
Checkstyle fix
Fixed findbugs issue
Merge pull request #2249 from pveentjer/findbugs-fixes

Resolved a bunch of findbugs issues