Don't clone if it's null. Fixes #1894