Don't fail on None, return as is.
Changelog.