I neglected to run unit tests before the previous commit, and failed to notice that a returned variable could possibly be undefined. Fixed.