Do not complete on error; fix
Adds timeout option for slow requests; fix