Tidied second previous Exception check.