Making my "goto fail;" feature optional