Fix error handling for offline support.

(untested. glasser told me what to type.)
Added two more missing 'new's I had missed