[#964308] Better error handling instead of timeouts. If no error event is returned, we still timeout.