Add missing return in error/fixup path

Also fix the code comment to reflect current state. Keep it as a warning,
as it should happen only on seldomly, and should help get feedback.

Followup to D16236.