RV-333: better missing code handling