Clean up and speed up exceptions