Handle fail scenarios consistently