Fix for issues identified by FindBugs
Fix for issues identified by FindBugs