Updated incorrect reference to deprecated elements and missing exceptions