Can you move this object construction to a separate method? I've been doing that in most of the ORM and has been quite useful for testing and injecting classes. The pattern I've followed is "if null is passed and not yet instantiated, then instantiate the default)