differentiate on differrent server errors.
Merge branch 'serverdelete'