Merge change 1898

* changes:
  Fix issues found by FindBugs.