handling server errors better
merge