Eliminated 2 FindBugs warnings