[Tutti-commits] 08/10: fix optional error (see #8109)