[#964308] Better error handling instead of timeouts. If no error event i...

...s returned, we still timeout.