Added security check for entries.