Good catch, another commit coming with a RUN-TIME exception.