chore(error-messaging): better error handling and message