Added control for empty entries.