More robust server state