fixed issue #1: Fatal error when database entry not found