findbugs: Potentially dangerous use of non-short-circuit logic

Signed-off-by: Shahar Havivi <shavivi@redhat.com>
Change-Id: I101e2ae3b9a1886d5394984c728e4844d1eb189f