Add option to fail early