comments, and re-add thrown errors when not in special case