Add operation error handling