improvements to server update error reporting
restore to initial commit