Fix FindBugs warnings
Merge pull request #1505 from dennishendriksen/master

Fix FindBugs warnings