Better CL error handling