Add missing exceptions