Bug 440246: Code cleanup

Fixes some issues reported by FindBugs.

Signed-off-by: Mickael Istria <mistria@redhat.com>
Merge branch '440246' of github.com:mickaelistria/thym into
mickaelistria-440246

Signed-off-by: Gorkem Ercan <gorkem.ercan@gmail.com>