Merge pull request #2075 from dennishendriksen/master

Tags (fixed)
Fix high priority Findbugs issue