Address FindBugs warnings
Merge pull request #1354 from maginatics/findbugs

Address FindBugs warnings