Error reporting

* Tuned up error reporting on CLI