Corrected some issues found by FindBugs.
Corrected some issues found by FindBugs.