Added missing exceptions.