Polish the server
Add timeout