diff --git a/Changes b/Changes
index 8dc5e204e..63bf9560b 100644
--- a/Changes
+++ b/Changes
@@ -2164,3 +2164,5 @@ seen. gmtime warning still there
 - Made some fixes to the resolver code under Win32
 - Fixed a bug in del_throttling_bucket 
 - Code cleanup (sys_errlist[])
+- Fixed a crash in SVSMOTD that could occur if invalid parameters were used. Reported by 
+  emigrant
diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c
index b564d0121..39da8b55e 100644
--- a/src/modules/m_svsmotd.c
+++ b/src/modules/m_svsmotd.c
@@ -139,7 +139,7 @@ int  m_svsmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
                   break;
           }
           default:
-                  break;
+                  return 0;
         }
         sendto_serv_butone_token(cptr, parv[0], MSG_SVSMOTD, TOK_SVSMOTD,
             "%s :%s", parv[1], parv[2]);