Added missing exceptions