Bugs #1321 & 1322

1 files changed, 5 insertions, 2 deletions

diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index ed25ce6bf..160b7102b 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -207,6 +207,11 @@ ChanAccess *ChannelInfo::GetAccess(unsigned index)
 
 AccessGroup ChannelInfo::AccessFor(User *u)
 {
+	AccessGroup group;
+
+	if (u == NULL)
+		return group;
+
 	NickCore *nc = u->Account();
 	if (nc == NULL && u->IsRecognized())
 	{
@@ -215,8 +220,6 @@ AccessGroup ChannelInfo::AccessFor(User *u)
 			nc = na->nc;
 	}
 
-	AccessGroup group;
-
 	group.SuperAdmin = u->SuperAdmin;
 	group.Founder = IsFounder(u, this);
 	group.ci = this;