diff --git a/xchat-2.4.2-nickmenu-away-msg.patch b/xchat-2.4.2-nickmenu-away-msg.patch
index f53895d..493ec0a 100644
--- a/xchat-2.4.2-nickmenu-away-msg.patch
+++ b/xchat-2.4.2-nickmenu-away-msg.patch
@@ -28,7 +28,7 @@ by Christopher Aillon <caillon@redhat.com>
 +			{
 +				away = find_away_message (current_sess->server, nick);
 +				snprintf (buf, sizeof (buf), _("Away Msg: %s"),
-+						away->message ? away->message : _("Unknown"));
++						away && away->message ? away->message : _("Unknown"));
 +				menu_quick_item (0, buf, submenu, 0, 0);
 +			}
 +
diff --git a/xchat.spec b/xchat.spec
index 95ba896..5f6e6cf 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -8,7 +8,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.4.2
-Release:   2
+Release:   3
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -113,6 +113,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Mar 28 2005 Christopher Aillon <caillon@redhat.com> 1:2.4.2-3
+- Fix crash when right clicking users whose away msg is unknown.
+
 * Fri Mar 25 2005 Christopher Aillon <caillon@redhat.com> 1:2.4.2-2
 - Add user's away message to right click menu, if known