Simplify error-handling to catch-all