Fix None server; add timeout