cherry-pick from main into humble to avoid UAF#4305

Merged

SteveMacenski merged 1 commit intoros-navigation:humblefrom

GoesM:humble

May 7, 2024

Commits on May 7, 2024

replace throw-error with error-log to avoid UAF mentioned in #4175 (#4180)

authored and
goes
committed