[BUGFIX] Follow-up to #62705: Fix fatal and unit test fail