ECDR-37: Added check for valid entries.