Added handling of null value in production value