[PATCH v2 0/2] domain_conf: rewriting else after return