Unified error handling again.