Fix up some exceptions