Apply @hauleth feedback - start using exit code for conditions