US91 more changes made for error handling