Improve error messages. Add Status