TODO comment
Only call ex-data once per error-handling

Previously we were calling it twice for every catch-data clause.