Update to changes (few months) from LolNexus

Since it loads the data "on the fly" now, there is some extra error
handling in place.