Some exceptions were added.