added fix to null value management
fix for issue ##2307
Fixed issue #2307