DIQ-347 better error handling for call_after_commit