diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index a9b8bdab..fce2ccf6 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.40  2002/03/07 14:51:57  makro
+// no message
+//
 // Revision 1.39  2002/02/26 04:02:53  jbravo
 // Getting rid of the triangles over teammates heads by making cg_drawFriend's
 // default 0
@@ -2183,7 +2186,9 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) {
 
 	CG_RegisterClients();		// if low on memory, some clients will be deferred
 
+//Makro - this should be moved out of missionpack eventually
 #ifdef MISSIONPACK
+	CG_LoadingString( "hud menu" );
 	CG_AssetCache();
 	CG_LoadHudMenu();      // load new hud stuff
 #endif
diff --git a/reaction/cgame/cg_view.c b/reaction/cgame/cg_view.c
index e1259a13..ea9e555a 100644
--- a/reaction/cgame/cg_view.c
+++ b/reaction/cgame/cg_view.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.19  2002/03/07 14:51:57  makro
+// no message
+//
 // Revision 1.18  2002/02/23 18:07:46  slicer
 // Changed Sniper code and Cam code
 //
@@ -1259,8 +1262,10 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo
 				if ( (cvar_val < cheats[i].low || cvar_val > cheats[i].high) )
 				{
 					CG_Printf("This server restricts %s to be between %1.11f and %1.11f\n",cheats[i].cvar,cheats[i].low, cheats[i].high);
-					trap_Cvar_Set("RQ3_CvarKickReason", cheats[i].cvar );
-					trap_SendConsoleCommand(va("disconnect\n"));
+					//Makro - a Com_Error would be nicer
+					//trap_Cvar_Set("RQ3_CvarKickReason", cheats[i].cvar );
+					//trap_SendConsoleCommand(va("disconnect\n"));
+					Com_Error( ERR_DISCONNECT, "WARNING: You have been disconnected from the server because %s was out of range (%1.3f - %1.3f)",cheats[i].cvar,cheats[i].low, cheats[i].high);
 				}
 
 			}