Findbugs error merged to master