More timeout and enumeration error handling