Improve cl
Error handling