fix(errors): More work on giving the desired output to the error messages