Some exceptions fixed