diff -urp --strip-trailing-cr ../drupal-6.x-dev/includes/file.inc ./includes/file.inc
--- ../drupal-6.x-dev/includes/file.inc	2007-12-19 22:40:04.000000000 +0100
+++ ./includes/file.inc	2007-12-21 11:40:04.000000000 +0100
@@ -118,7 +118,9 @@ function file_check_directory(&$director
       drupal_set_message(t('The permissions of directory %directory have been changed to make it writable.', array('%directory' => $directory)));
     }
     else {
-      form_set_error($form_item, t('The directory %directory is not writable', array('%directory' => $directory)));
+      if ($form_item) {
+        form_set_error($form_item, t('The directory %directory is not writable', array('%directory' => $directory)));
+      }
       watchdog('file system', 'The directory %directory is not writable, because it does not have the correct permissions set.', array('%directory' => $directory), WATCHDOG_ERROR);
       return FALSE;
     }
@@ -132,7 +134,9 @@ function file_check_directory(&$director
     }
     else {
       $variables = array('%directory' => $directory, '!htaccess' => '<br />'. nl2br(check_plain($htaccess_lines)));
-      form_set_error($form_item, t("Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: <code>!htaccess</code>", $variables));
+      if ($form_item) {
+        form_set_error($form_item, t("Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: <code>!htaccess</code>", $variables));
+      }
       watchdog('security', "Security warning: Couldn't write .htaccess file. Please create a .htaccess file in your %directory directory which contains the following lines: <code>!htaccess</code>", $variables, WATCHDOG_ERROR);
     }
   }