diff --git a/Changes b/Changes
index 47a948d48..ccc09fc35 100644
--- a/Changes
+++ b/Changes
@@ -784,4 +784,5 @@ seen. gmtime warning still there
 - Using bahamut /who now, this needs some testing.
 - HCN fix
 - /who fix .. removed nick matching functionality..
-- Fixed a SNOMASK problem found by Arantis
\ No newline at end of file
+- Fixed a SNOMASK problem found by Arantis
+- Fixed a umode2 bug that crashed the server
diff --git a/src/s_user.c b/src/s_user.c
index eee531ca6..b398a74dd 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -4449,6 +4449,8 @@ int  m_umode2(cptr, sptr, parc, parv)
 		NULL
 	};
 
+	if (!parv[1])
+		return 0;
 	m_umode(cptr, sptr, parv[3] ? 4 : 3, xparv);
 }