Bug 440246: Code cleanup

Fixes some issues reported by FindBugs.

Signed-off-by: Mickael Istria <mistria@redhat.com>