diff --git a/.RELEASE.NOTES b/.RELEASE.NOTES
index e0ff90c0c..f029a2bb7 100644
--- a/.RELEASE.NOTES
+++ b/.RELEASE.NOTES
@@ -96,6 +96,7 @@ NOTE: This is a Release Candidate. This is NOT an (official) STABLE release yet
 - Sometimes a serious flood of notices was generated if link::options::nodnscache was used.
 - Spamfilter: action 'viruschan' combined with target 'user' caused crashes.
 - chinese-* nick characters support caused memory corruption.
+- Crash issue regarding SSL and junk snomask.
 
 ==[ MINOR BUGS FIXED ]==
 - Now properly resolves hostnames again that use CNAME delegation (got broken in 3.2.3).
diff --git a/Changes b/Changes
index bfbedc958..94d187244 100644
--- a/Changes
+++ b/Changes
@@ -1019,3 +1019,5 @@
   some bans in pre2/rc1. Bug reported by HERZ (#0002772).
 - Fixed localhost crash (if no dns record for 127.0.0.1), reported by Trocotronic (#2773).
 ** public 3.2.4-rc2 release **
+- Sometimes if an oper was connected trough SSL and had the junk snomask (+s +j) set it
+  would cause a crash. Reported by chasingsol (#0002777).
diff --git a/src/ssl.c b/src/ssl.c
index 0d40b8775..73b90cc0c 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -596,9 +596,9 @@ static int fatal_ssl_error(int ssl_error, int where, aClient *sptr)
      * the only way to do it.
      * IRC protocol wasn`t SSL enabled .. --vejeta
      */
+    sptr->flags |= FLAGS_DEADSOCKET;
     sendto_snomask(SNO_JUNK, "Exiting ssl client %s: %s: %s",
     	get_client_name(sptr, TRUE), ssl_func, ssl_errstr);
-    sptr->flags |= FLAGS_DEADSOCKET;
 	if (errtmp)
 	{
 		SET_ERRNO(errtmp);