Reviewed. Looks reasonable, though just by eyeballing it it's not clear that it gives a good error message