Error during drupal 10 update

Here is the patch

We were suffering the same problem, I came to the same conclusion, thanks for the patch, works for me! A super minor stylistic point but it might be worth either adding the condition to a new line with its own comment like Skip fields with custom storage or perhaps just updating the existing comment. Thanks!

Patch #2 works fine for me