Code cleanup.

Displaying error message when Entry is not found. Cleaned up invalid
database entries.