I think you're better off doing that: it's more in keeping with the existing code, and the specific scenario is unlikely to come up in production.