diff --git a/ChangeLog b/ChangeLog
index 105e180c1..c1b140a9d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-02-13 Alexander M. Turek  <resist@derrabus.de>
+    * libraries/common.lib.php: Fixed bug #890186 (PMA chokes on undefined
+      parser functions if one of the very first queries fails.
+
 2004-02-11 Marc Delisle  <lem9@users.sourceforge.net>
     * server_privileges.php: bug 818654, password not copied
     * read_dump.php, libraries/display_tbl.lib.php, /bookmark.lib.php:
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 65cfad4ae..3783882ad 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -356,7 +356,7 @@ if ($is_minimum_common == FALSE) {
         // Check that we actually have a valid set of parsed data
         // well, not quite
         // first check for the SQL parser having hit an error
-        if (PMA_SQP_isError()) {
+        if (!defined('PMA_SQP_isError') || PMA_SQP_isError()) {
             return $parsed_sql;
         }
         // then check for an array
@@ -467,7 +467,7 @@ if ($is_minimum_common == FALSE) {
         // --- Added to solve bug #641765
         // Robbat2 - 12 January 2003, 9:46PM
         // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
-        if (PMA_SQP_isError()) {
+        if (!defined('PMA_SQP_isError') || PMA_SQP_isError()) {
             $parsed_sql = htmlspecialchars($the_query);
         } else {
             $parsed_sql = PMA_SQP_parse($the_query);
@@ -482,7 +482,7 @@ if ($is_minimum_common == FALSE) {
             // --- Added to solve bug #641765
             // Robbat2 - 12 January 2003, 9:46PM
             // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
-            if (PMA_SQP_isError()) {
+            if (defined('PMA_SQP_isError') && PMA_SQP_isError()) {
                 echo PMA_SQP_getErrorString();
             }
             // ---