Merge "Cleanup exceptions"