Fix the missing exceptions