--- bootstrap.inc.dist	2005-08-24 17:09:21.000000000 +0100
+++ bootstrap.inc	2005-08-24 17:09:39.000000000 +0100
@@ -760,11 +760,11 @@
  *   - 'error'
  */
 function drupal_set_message($message = NULL, $type = 'status') {
+  if (!isset($_SESSION['messages'])) {
+    $_SESSION['messages'] = array();
+  }
+  
   if (isset($message)) {
-    if (!isset($_SESSION['messages'])) {
-      $_SESSION['messages'] = array();
-    }
-
     if (!isset($_SESSION['messages'][$type])) {
       $_SESSION['messages'][$type] = array();
     }