Add cleanup on nulled value