Added check for completeness of entry