diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp
index 9ec98d2bb..e99670422 100644
--- a/projects/mtg/src/AIPlayerBaka.cpp
+++ b/projects/mtg/src/AIPlayerBaka.cpp
@@ -2209,6 +2209,20 @@ AIPlayerBaka::AIPlayerBaka(GameObserver *observer, string file, string fileSmall
         }
         mAvatarName = avatarFile;
     }
+    else //load a random avatar.
+    {
+        avatarFile = "avatar";
+        char buffer[3];
+        sprintf(buffer, "%i", int(rand()%100));
+        avatarFile.append(buffer);
+        avatarFile.append(".jpg");
+        if(!loadAvatar(avatarFile, "bakaAvatar"))
+        {
+            avatarFile = "baka.jpg";
+            loadAvatar(avatarFile, "bakaAvatar");
+        }
+        mAvatarName = avatarFile;
+    }
 
     if (fileSmall == "ai_baka_eviltwin")
         mAvatar->SetHFlip(true);
diff --git a/projects/mtg/src/DeckManager.cpp b/projects/mtg/src/DeckManager.cpp
index 92e74f79e..0cf3984ab 100644
--- a/projects/mtg/src/DeckManager.cpp
+++ b/projects/mtg/src/DeckManager.cpp
@@ -185,8 +185,8 @@ StatsWrapper * DeckManager::getExtendedDeckStats( DeckMetaData *selectedDeck, MT
 {
     StatsWrapper* stats = NULL;
 
-    string deckName = selectedDeck->getFilename();
-    int deckId = selectedDeck->getDeckId();
+    string deckName = selectedDeck?selectedDeck->getFilename():"";
+    int deckId = selectedDeck?selectedDeck->getDeckId():0;
 
     map<string, StatsWrapper*>* statsMap = isAI ? &aiDeckStatsMap : &playerDeckStatsMap;
     if ( statsMap->find(deckName) == statsMap->end())