diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
index ffe80ecdf55..2edf005832f 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -409,6 +409,7 @@ public final class ImageCache {
             // legitimate, happens when a card has no image
             return null;
         } catch (ComputationException ex) {
+            // too low memory
             if (ex.getCause() instanceof NullPointerException) {
                 return null;
             }
diff --git a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
index afe179f7c7d..636305a79df 100644
--- a/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/load/LoadTest.java
@@ -10,6 +10,7 @@ import mage.cards.decks.DeckCardInfo;
 import mage.cards.decks.DeckCardLists;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
+import mage.cards.repository.CardScanner;
 import mage.constants.*;
 import mage.game.match.MatchOptions;
 import mage.player.ai.ComputerPlayer;
@@ -21,9 +22,7 @@ import mage.remote.SessionImpl;
 import mage.util.RandomUtil;
 import mage.view.*;
 import org.apache.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 
 /**
  * Intended to test Mage server under different load patterns.
@@ -45,6 +44,12 @@ public class LoadTest {
     private static final String TEST_PROXY_TYPE = "None";
     private static final String TEST_USER_NAME = "user";
 
+    @BeforeClass
+    public static void initDatabase() {
+        // recreate missing cards db
+        CardScanner.scan();
+    }
+
     @Test
     public void test_CreateRandomDeck() {