Fix missing exceptions