Tidied up failure cases.