Small exceptions fix