Added control on NULL values