Merge "Cleanup exceptions in tempest"