I think doing it once all of my in-progress PR's on XBlock land would be good. I'm not sure if edx-platform uses KeyError as well, so I'll have to take a look at that.