Address FindBugs complaints
Merge pull request #1344 from maginatics/findbugs

Address FindBugs complaints