Fixed up some exceptions.