diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index ba155bd4..d3bb0894 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -244,6 +244,8 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
 	static int	errorCount;
 	int			currentTime;
 
+	Cvar_Set( "com_errorCode", va( "%i", code ) );
+
 	// when we are running automated scripts, make sure we
 	// know if anything failed
 	if ( com_buildScript && com_buildScript->integer ) {
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 92841276..69d08eab 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -708,7 +708,7 @@ void SV_FinalMessage( char *message ) {
 				// don't send a disconnect to a local client
 				if ( cl->netchan.remoteAddress.type != NA_LOOPBACK ) {
 					SV_SendServerCommand( cl, "print \"%s\n\"\n", message );
-					SV_SendServerCommand( cl, "disconnect" );
+					SV_SendServerCommand( cl, "disconnect \"%s\"", message );
 				}
 				// force a snapshot to be sent
 				cl->nextSnapshotTime = -1;