diff --git a/Changes b/Changes
index 4a1e5f04d..131f3d5c2 100644
--- a/Changes
+++ b/Changes
@@ -748,5 +748,4 @@ seen. gmtime warning still there
    * setgid has to be called before setuid... cos if you change to a non-priv
       uid first then you are not allowed to setgid!
 - Added more network files
-
-   
+- Fixed a possible restart/die bug
diff --git a/src/s_serv.c b/src/s_serv.c
index 3473e0cbb..3ac2165b3 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -4060,7 +4060,7 @@ int  m_restart(cptr, sptr, parc, parv)
 
 	}
 
-	if ((pass = conf_drpass->restart))
+	if (conf_drpass && (pass = conf_drpass->restart))
 	{
 		if (parc < 2)
 		{
@@ -4707,7 +4707,7 @@ int  m_die(cptr, sptr, parc, parv)
 		return 0;
 	}
 
-	if ((pass = conf_drpass->die))	/* See if we have and DIE/RESTART password */
+	if (conf_drpass && (pass = conf_drpass->die))	/* See if we have and DIE/RESTART password */
 	{
 		if (parc < 2)	/* And if so, require a password :) */
 		{