Fixed an issue with null entries.