Some basic exception work for #222