Clean error handling