Will now use a non-zero return code in case of failures: Rework after review.