Some exceptions added.