A RuntimeError is used in a couple of other spots here -- should those be changed too?