Updated Null pointer issue