fix findbugs problems
Merge pull request #216 from hgschmie/findbugs

fix findbugs problems