Some updates for error messages
Ehanced error handling and changed ROLE handling