Added some proper handling for server timeout (initial)