diff --git a/Changes b/Changes
index 742aa7a56..930f199d8 100644
--- a/Changes
+++ b/Changes
@@ -674,3 +674,4 @@ seen. gmtime warning still there
   codemastr
 - Some configure.in fixes to pthread stuff
 - Added possiblity to add parameters to configure in Config
+- Minor SJOIN fix .. 
\ No newline at end of file
diff --git a/src/send.c b/src/send.c
index 90bf7fe2f..be42f2b36 100644
--- a/src/send.c
+++ b/src/send.c
@@ -735,10 +735,11 @@ void sendto_serv_butone_token_opt(aClient *one, int opt, char *prefix, char *com
 	if (strchr(prefix, '.'))
 	{
 		acptr = (aClient *) find_server_quick(prefix);
-		if (acptr->serv->numeric)
-		{
-			strcpy(pref, base64enc(acptr->serv->numeric));
-		}
+		if (acptr && acptr->serv)
+			if (acptr->serv->numeric)
+			{
+				strcpy(pref, base64enc(acptr->serv->numeric));
+			}
 	}
 
 	strcpy(tcmd, token);