Merge branch 'master' into patched-master

1 files changed, 1 insertions, 1 deletions

diff --git a/nick.c b/nick.c
index f782aea2..68cdabd3 100644
--- a/nick.c
+++ b/nick.c
@@ -292,7 +292,7 @@ void nick_del(bee_user_t *bu)
 void nick_strip(irc_t *irc, char *nick)
 {
 	int len = 0;
-	gboolean nick_underscores = set_getbool(&irc->b->set, "nick_underscores");
+	gboolean nick_underscores = irc ? set_getbool(&irc->b->set, "nick_underscores") : FALSE;
 
 	if (irc && (irc->status & IRC_UTF8_NICKS)) {
 		gunichar c;