Can you test for a not null value here and return immediately the current value? That's how we do that in Symfony. Thanks.