diff --git a/ChangeLog b/ChangeLog
index e86418650..a9a7109ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-02 German Arias <german@xelalug.org>
+
+	* Source/NSAlert.m (-_setupPanel): Verify if there is error
+	information to be displayed.
+
 2011-12-02  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSTextView.m (-buildUpTextNetwork:):
diff --git a/Source/NSAlert.m b/Source/NSAlert.m
index 9603bcce4..ce371df69 100644
--- a/Source/NSAlert.m
+++ b/Source/NSAlert.m
@@ -2002,7 +2002,7 @@ void NSBeginInformationalAlertSheet(NSString *title,
       [panel setTitleBar: title
              icon: _icon
              title: _message_text != nil ? _message_text : _(@"Alert")
-	     message: _informative_text];
+	     message: _informative_text != nil ? _informative_text : _(@"No information")];
       [panel setButtons: _buttons];
     }
 }