Clear up exception handling