From 243621f19e56b304b431e570ad5cdccb0f70d9c9 Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 7 Feb 2016 11:47:34 +0000
Subject: [PATCH] - Additional changes related to the previous commit.

---
 forge-gui/src/main/java/forge/player/GamePlayerUtil.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java
index 7c504069949..f2c9251491c 100644
--- a/forge-gui/src/main/java/forge/player/GamePlayerUtil.java
+++ b/forge-gui/src/main/java/forge/player/GamePlayerUtil.java
@@ -63,6 +63,12 @@ public final class GamePlayerUtil {
         String profile = "";
         if (profileOverride.isEmpty()) {
             String lastProfileChosen = FModel.getPreferences().getPref(FPref.UI_CURRENT_AI_PROFILE);
+            if (!AiProfileUtil.getProfilesDisplayList().contains(lastProfileChosen)) {
+                System.out.println("[AI Preferences] Unknown profile " + lastProfileChosen + " was requested, resetting to default.");
+                lastProfileChosen = "Default";
+                FModel.getPreferences().setPref(FPref.UI_CURRENT_AI_PROFILE, "Default");
+                FModel.getPreferences().save();
+            }
             player.setRotateProfileEachGame(lastProfileChosen.equals(AiProfileUtil.AI_PROFILE_RANDOM_DUEL));
             if (lastProfileChosen.equals(AiProfileUtil.AI_PROFILE_RANDOM_MATCH)) {
                 lastProfileChosen = AiProfileUtil.getRandomProfile();