Address FindBugs errors
Merge pull request #1347 from maginatics/findbugs

Address FindBugs errors