More error handling.
More error handling.

web-archive-group/WAHR,web-archive-group/WAHR,web-archive-group/WAHR,ianmilligan1/WAHR,web-archive-group/WAHR,ianmilligan1/WAHR,web-archive-group/WAHR,ianmilligan1/WAHR,ianmilligan1/WAHR