Put back `.orNull` lost in earlier merge for #1941