Change the semantics on failure slightly