Fixed small issue with null values.