Ensure prepopulation parameters persist even if an error occurs on initial entry creation. Fixes #2211