[case 9257] Fixed some of the findbugs findings