Timeout shouldnt lead to exception.
Merge branch 'master' into error-reporting