diff -r 5c4c7be53d37 -r f57f4ecc3302 src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Tue Mar 07 07:17:39 2006 +0000
+++ b/src/protocols/irc/irc.c	Tue Mar 07 07:22:09 2006 +0000
@@ -502,12 +502,12 @@
 static void irc_set_status(GaimAccount *account, GaimStatus *status)
 {
 	GaimConnection *gc = gaim_account_get_connection(account);
-	struct irc_conn *irc = NULL;
+	struct irc_conn *irc;
 	const char *args[1];
 	const char *status_id = gaim_status_get_id(status);
 
-	if (gc)
-		irc = gc->proto_data;
+	g_return_if_fail(gc != NULL);
+	irc = gc->proto_data;
 
 	if (!gaim_status_is_active(status))
 		return;