Adding server and client timeout errors