diff --git a/HISTORY b/HISTORY
index 722971f..f4b2260 100644
--- a/HISTORY
+++ b/HISTORY
@@ -12,3 +12,4 @@ Version 0.0.2
 - added common channel logo path for all skins
 - changed skin handling so that every skin is directly shown in VDR OSD Menu
 - added Theme support, each skin can now have various themes
+- fixed a crash if no skindesigner skins are found and plugin setup menu is called from another skin
diff --git a/setup.c b/setup.c
index 0b85782..6809c99 100644
--- a/setup.c
+++ b/setup.c
@@ -19,6 +19,12 @@ void cSkinDesignerSetup::Setup(void) {
     Add(new cMenuEditIntItem(tr("Number to cache initially (per size)"), &data.numLogosPerSizeInitial, 0, 1000));
     Add(new cMenuEditIntItem(tr("Number to cache in maximum"), &data.numLogosMax, 0, 1000));
 
+    if (!imgCache) {
+        SetCurrent(Get(current));
+        Display();
+        return;
+    }
+
     cString message = cString::sprintf("--------------------- %s ---------------------", tr("Cache Statistics"));
     Add(new cOsdItem(*message));
     cList<cOsdItem>::Last()->SetSelectable(false);
diff --git a/skindesigner.c b/skindesigner.c
index 317a629..131a23b 100644
--- a/skindesigner.c
+++ b/skindesigner.c
@@ -112,6 +112,9 @@ bool cPluginSkinDesigner::Start(void) {
             newSkin->ActivateBackupSkin();
         }
     }
+    if (skins.size() == 0) {
+        esyslog("skindesigner: no skins found! Using default Skin LCARS!");
+    }
     return true;
 }