Added bit about null handling