diff --git a/ChangeLog b/ChangeLog
index af2bdddbe..da6d32c77 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,7 +32,9 @@ $Source$
     * Documentation.html: Updated for my new features. Should include
       everyting, I hope. But seriously needs a proofread.
     * config.inc.php3: Inserted new directives for empty
-      $cfg['Servers'][$i].
+      $cfg['Servers'][$i]. (history, verbose_check)
+    * tbl_create.php3, tbl_addfield.php3, tbl_alter.php3: Added more checks
+      to suppress Notices/Warnings when MIME-types are not enabled.
 
 2003-02-26 Garvin Hicking <me@supergarv.de>
     * lang/german-*: better grammar. ;)
diff --git a/tbl_addfield.php3 b/tbl_addfield.php3
index aceb211c3..7a61105ba 100755
--- a/tbl_addfield.php3
+++ b/tbl_addfield.php3
@@ -199,7 +199,7 @@ if (isset($submit)) {
     $cfgRelation = PMA_getRelationsParam();
 
     // garvin: Update comment table, if a comment was set.
-    if (is_array($field_comments) && $cfgRelation['commwork']) {
+    if (isset($field_comments) && is_array($field_comments) && $cfgRelation['commwork']) {
         @reset($field_comments);
         while(list($fieldindex, $fieldcomment) = each($field_comments)) {
             PMA_setComment($db, $table, $field_name[$fieldindex], $fieldcomment);
@@ -207,7 +207,7 @@ if (isset($submit)) {
     }
     
     // garvin: Update comment table for mime types [MIME]
-    if (is_array($field_mimetype) && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME']) {
+    if (isset($field_mimetype) && is_array($field_mimetype) && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME']) {
         @reset($field_mimetype);
         while(list($fieldindex, $mimetype) = each($field_mimetype)) {
             PMA_setMIME($db, $table, $field_name[$fieldindex], $mimetype, $field_transformation[$fieldindex], $field_transformation_options[$fieldindex]);
diff --git a/tbl_alter.php3 b/tbl_alter.php3
index 8574ee917..3b87000f3 100755
--- a/tbl_alter.php3
+++ b/tbl_alter.php3
@@ -95,7 +95,7 @@ if (isset($submit)) {
     $cfgRelation = PMA_getRelationsParam();
     
     // garvin: Update comment table, if a comment was set.
-    if (is_array($field_comments) && $cfgRelation['commwork']) {
+    if (isset($field_comments) && is_array($field_comments) && $cfgRelation['commwork']) {
         @reset($field_comments);
         while(list($fieldindex, $fieldcomment) = each($field_comments)) {
             PMA_setComment($db, $table, $field_name[$fieldindex], $fieldcomment, $field_orig[$fieldindex]);
@@ -103,7 +103,7 @@ if (isset($submit)) {
     }
 
     // garvin: Update comment table for mime types [MIME]
-    if (is_array($field_mimetype) && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME']) {
+    if (isset($field_mimetype) && is_array($field_mimetype) && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME']) {
         @reset($field_mimetype);
         while(list($fieldindex, $mimetype) = each($field_mimetype)) {
             PMA_setMIME($db, $table, $field_name[$fieldindex], $mimetype, $field_transformation[$fieldindex], $field_transformation_options[$fieldindex]);
diff --git a/tbl_create.php3 b/tbl_create.php3
index f6a1fc558..b67fb7aeb 100755
--- a/tbl_create.php3
+++ b/tbl_create.php3
@@ -200,7 +200,7 @@ if (isset($submit)) {
     $cfgRelation = PMA_getRelationsParam();
 
     // garvin: Update comment table, if a comment was set.
-    if (is_array($field_comments) && $cfgRelation['commwork']) {
+    if (isset($field_comments) && is_array($field_comments) && $cfgRelation['commwork']) {
         @reset($field_comments);
         while(list($fieldindex, $fieldcomment) = each($field_comments)) {
             PMA_setComment($db, $table, $field_name[$fieldindex], $fieldcomment);
@@ -208,7 +208,7 @@ if (isset($submit)) {
     }
 
     // garvin: Update comment table for mime types [MIME]
-    if (is_array($field_mimetype) && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME']) {
+    if (isset($field_mimetype) && is_array($field_mimetype) && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME']) {
         @reset($field_mimetype);
         while(list($fieldindex, $mimetype) = each($field_mimetype)) {
             PMA_setMIME($db, $table, $field_name[$fieldindex], $mimetype, $field_transformation[$fieldindex], $field_transformation_options[$fieldindex]);