Fix issues with previous change relating to failures/errors