diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp
index 06d1ab83d..fdd71162f 100644
--- a/projects/mtg/src/CardGui.cpp
+++ b/projects/mtg/src/CardGui.cpp
@@ -153,16 +153,22 @@ void CardGui::Render()
     if (actZ > 1)
     {
         shadow = game? game->getResourceManager()->GetQuad("shadow"):WResourceManager::Instance()->GetQuad("shadow");
-        shadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,255,255,255));
-        renderer->RenderQuad(shadow.get(), actX + (actZ - 1) * 15, actY + (actZ - 1) * 15, actT, 28 * actZ / 16, 40 * actZ / 16);
+        if (shadow) 
+        {
+            shadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,255,255,255));
+            renderer->RenderQuad(shadow.get(), actX + (actZ - 1) * 15, actY + (actZ - 1) * 15, actT, 28 * actZ / 16, 40 * actZ / 16);
+        }
     }
 
     JQuadPtr extracostshadow;
     if (card->isExtraCostTarget)
     {
         extracostshadow = card->getObserver()->getResourceManager()->GetQuad("extracostshadow");
-        extracostshadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,100,0,0));
-        renderer->RenderQuad(extracostshadow.get(), actX + (actZ - 1) * 15, actY + (actZ - 1) * 15, actT, 28 * actZ / 16, 40 * actZ / 16);
+        if (extracostshadow) 
+        {
+            extracostshadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,100,0,0));
+            renderer->RenderQuad(extracostshadow.get(), actX + (actZ - 1) * 15, actY + (actZ - 1) * 15, actT, 28 * actZ / 16, 40 * actZ / 16);
+        }
     }
 
     if(game && game->connectRule)
@@ -305,8 +311,11 @@ void CardGui::Render()
     {
         if (!shadow)
             shadow = card->getObserver()->getResourceManager()->GetQuad("shadow");
-        shadow->SetColor(ARGB(200,255,255,255));
-        renderer->RenderQuad(shadow.get(), actX, actY, actT, (28 * actZ + 1) / 16, 40 * actZ / 16);
+        if (shadow)
+        {
+            shadow->SetColor(ARGB(200,255,255,255));
+            renderer->RenderQuad(shadow.get(), actX, actY, actT, (28 * actZ + 1) / 16, 40 * actZ / 16);
+        }
     }
 
     // Render a mask over the card, if set
diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index 839c5cbbb..fa0bed265 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -1056,6 +1056,7 @@ JSample * MTGCardInstance::getSample()
     if(!types.size())
         return NULL;   
     type = Subtypes::subtypesList->find(types[0]);
+    std::transform(type.begin(), type.end(), type.begin(), ::tolower);
     type.append(".wav");
     js = WResourceManager::Instance()->RetrieveSample(type);
     if (js)