diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index 778709d1..8e45dca0 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -248,21 +248,25 @@ void PictureLoader::picDownloadFinished(QNetworkReply *reply)
         extension = ".jpg";
     
     if (imgReader.read(&testImage)) {
-        if (!QDir().mkpath(picsPath + "/downloadedPics/" + cardBeingDownloaded.getSetName())) {
-            qDebug() << picsPath + "/downloadedPics/" + cardBeingDownloaded.getSetName() + " could not be created.";
-            return;
+        QString setName = cardBeingDownloaded.getSetName();
+        if(!setName.isEmpty())
+        {
+            if (!QDir().mkpath(picsPath + "/downloadedPics/" + setName)) {
+                qDebug() << picsPath + "/downloadedPics/" + setName + " could not be created.";
+                return;
+            }
+
+            QString suffix;
+            if (!cardBeingDownloaded.getStripped())
+                suffix = ".full";
+
+            QFile newPic(picsPath + "/downloadedPics/" + setName + "/" + cardBeingDownloaded.getCard()->getCorrectedName() + suffix + extension);
+            if (!newPic.open(QIODevice::WriteOnly))
+                return;
+            newPic.write(picData);
+            newPic.close();
         }
 
-        QString suffix;
-        if (!cardBeingDownloaded.getStripped())
-            suffix = ".full";
-
-        QFile newPic(picsPath + "/downloadedPics/" + cardBeingDownloaded.getSetName() + "/" + cardBeingDownloaded.getCard()->getCorrectedName() + suffix + extension);
-        if (!newPic.open(QIODevice::WriteOnly))
-            return;
-        newPic.write(picData);
-        newPic.close();
-
         emit imageLoaded(cardBeingDownloaded.getCard(), testImage);
     } else if (cardBeingDownloaded.getHq()) {
         qDebug() << "HQ: received invalid picture. URL:" << reply->request().url();