diff --git a/GameSettings.cpp b/GameSettings.cpp
index 5fbbe525..6ab331ec 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -467,10 +467,17 @@ void LoadGameExternalOptions()
 	// WANNE: Drop Items
 	gGameExternalOptions.ubEnemiesItemDrop					= iniReader.ReadInteger("JA2 Gameplay Settings","ENEMIES_ITEM_DROP", 0);
 
+	// WANNE: Auto save: I did not set USE_AUTO_SAVE in the ja2_options.ini, because
+	// the game always crashes after a "normal" savegame is loaded after loading an autosave
+	// So for now USE_AUTO_SAVE is always false.
+	// The game crashes when removing mouse region that are not set
+	// After we fix that bug, we can make the entry USE_AUTO_SAVE in the ja2_options.ini
+	gGameExternalOptions.gfUseAutoSave						= iniReader.ReadBoolean("JA2 Gameplay Settings","USE_AUTO_SAVE",FALSE);
+
 	// Militia settings
-	gGameExternalOptions.gfAllowMilitiaGroups				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",0);
-	gGameExternalOptions.gfAllowReinforcements				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",0);
-	gGameExternalOptions.gfAllowReinforcementsOnlyInCity	= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS_ONLY_IN_CITIES",0);
+	gGameExternalOptions.gfAllowMilitiaGroups				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",FALSE);
+	gGameExternalOptions.gfAllowReinforcements				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",FALSE);
+	gGameExternalOptions.gfAllowReinforcementsOnlyInCity	= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS_ONLY_IN_CITIES",FALSE);
 	gGameExternalOptions.guiBaseQueenPoolIncrement			= iniReader.ReadInteger("JA2 Gameplay Settings","QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL",60);
 	
 	gGameExternalOptions.guiCreateEachNHours				= iniReader.ReadInteger("JA2 Gameplay Settings","CREATE_EACH_N_HOURS",24);
diff --git a/GameSettings.h b/GameSettings.h
index b4a46bf2..65c96224 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -309,6 +309,8 @@ typedef struct
 	// WANNE
 	INT32 ubEnemiesItemDrop;
 
+	BOOLEAN gfUseAutoSave;
+
 	//Merc Assignment settings
 	INT32 ubAssignmentUnitsPerDay;
 	INT32 ubMinutesForAssignmentToCount;
diff --git a/JA2.suo b/JA2.suo
index 1e3ba24d..116de0a1 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/SaveLoadScreen.cpp b/SaveLoadScreen.cpp
index 3c5c2fc1..e553e225 100644
--- a/SaveLoadScreen.cpp
+++ b/SaveLoadScreen.cpp
@@ -714,7 +714,6 @@ void			ExitSaveLoadScreen()
 {
 	INT8	i;
 
-
 	gfLoadGameUponEntry = FALSE;
 
 	if( !gfSaveLoadScreenButtonsCreated )
@@ -738,7 +737,7 @@ void			ExitSaveLoadScreen()
 
 	for(i=0; i<NUM_SAVE_GAMES; i++)
 	{
-	  MSYS_RemoveRegion( &gSelectedSaveRegion[i]);
+		MSYS_RemoveRegion( &gSelectedSaveRegion[i]);
 	}
 
 	DeleteVideoObjectFromIndex( guiSlgBackGroundImage );
@@ -847,14 +846,14 @@ void		GetSaveLoadScreenUserInput()
 	}
 
 
-	if( gfKeyState[ ALT ] )
+	/*if( gfKeyState[ ALT ] )
 	{
 		DisplayOnScreenNumber( FALSE );
 	}
 	else
 	{
 		DisplayOnScreenNumber( TRUE );
-	}
+	}*/
 
 	if( gfKeyState[ CTRL ] || fWasCtrlHeldDownLastFrame )
 	{
diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp
index 34ad800a..a7d1da6d 100644
--- a/Tactical/Handle UI.cpp	
+++ b/Tactical/Handle UI.cpp	
@@ -1172,7 +1172,11 @@ UINT32 UIHandleEndTurn( UI_EVENT *pUIEvent )
 	}
 	else
 	{
-		if( FileExists( "..\\AutoSave.pls" ) && CanGameBeSaved() )
+		// WANNE: Changed the auto save depending from AutoSave.pls
+		// to an option setting.
+		// So no more need to have a file AutoSave.pls in you ja2 root directory
+		//if( FileExists( "..\\AutoSave.pls" ) && CanGameBeSaved() )
+		if (gGameExternalOptions.gfUseAutoSave == TRUE && CanGameBeSaved() )
 		{
 			//Save the game
 			guiPreviousOptionScreen = guiCurrentScreen;
diff --git a/Utils/message.cpp b/Utils/message.cpp
index 3ba15fff..67f78d44 100644
--- a/Utils/message.cpp
+++ b/Utils/message.cpp
@@ -573,8 +573,8 @@ void UnHideMessagesDuringNPCDialogue( void )
 
 void ScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...)
 {
-	__try
-	{
+	//__try
+	//{
 		wchar_t	DestString[512];
 		va_list argptr;
 
@@ -648,11 +648,11 @@ void ScreenMsg( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...)
 		}
 
 		return;
-	}
-	__except(filter(GetExceptionCode(), GetExceptionInformation()))
-	{
-		return;
-	}
+	//}
+	//__except(filter(GetExceptionCode(), GetExceptionInformation()))
+	//{
+	//	return;
+	//}
 }
 
 void ClearWrappedStrings( WRAPPED_STRING *pStringWrapperHead )