More cleanup; handling server errors