SpotBugs is touchy about nulls here, all of which are guaranteed
to work out due to verification logic -- but that is not quite
obvious. Fix this up by adding explicit verifies -- which do not
hurn that much.
Change-Id: I92a120c9f8d4fced2bf3e8a859772cf6d41798df Signed-off-by: Robert Varga <robert.varga@pantheon.tech>