There is an error reset following the function and check for
startupPolicy before that.  Let's reflect those things inside that
function so that future code doesn't have to be that complex.
Signed-off-by: NMartin Kletzander <mkletzan@redhat.com>