Improved error handling using domain module
Adjusted text in cli