APP-194 handling some step fail cases