Adding support for non-terminal failures