Exception tidied