Clean-up of exceptions