added handling of timeout errors to proxy