[sr-dev] git:master: Prevent NULL pointer dereference when rtype was incorrect