US91 More error handling fixes