CID:1215198 don't set variables that are not used, and clean up the bail out usage condition to be more sane
