Simplify error handling