Hb bug fix 33208 2350688

Fixes https://www.honeybadger.io/inspector/p/33208/2350688

Fixes another edge case discovered at debugging as well.