Make the update server command more robust - Ref #284