diff --git a/ChangeLog b/ChangeLog
index 1009eda2e..3f172d7b9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-03-25 Michal Cihar  <michal@cihar.com>
+    * libraries/bookmark.lib.php: Fix errors when bookmarktable does not
+      exists (bug #922509).
+
 2004-03-24 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug 922553, wrong boundary check in
       PMA_flipstring(), thanks to Virgile Petit (pvtc)
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 970f74afd..a7c2cfd86 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -102,6 +102,7 @@ function PMA_queryBookmarks($db, $cfgBookmark, $id, $id_field = 'id', $action_bo
                     . '      OR user = \'\')' )
                     . ' AND ' . PMA_backquote($id_field) . ' = ' . $id;
     $result = PMA_DBI_try_query($query, $dbh);
+    if (!$result) return FALSE;
     list($bookmark_query) = PMA_DBI_fetch_row($result) or array(FALSE);
 
     return $bookmark_query;