Fix high priority Findbugs issue
Merge pull request #2082 from dennishendriksen/master

Fix high priority Findbugs issue