Fix setup fails then remaining commands still executed

Fix setup fails then remaining commands still executed #236