Updated parsing methods to take advantage of new exceptions.