diff --git a/src/Mayaqua/Cfg.c b/src/Mayaqua/Cfg.c
index 829ad53a..62551954 100644
--- a/src/Mayaqua/Cfg.c
+++ b/src/Mayaqua/Cfg.c
@@ -2338,6 +2338,11 @@ void CfgDeleteFolder(FOLDER *f)
 		return;
 	}
 
+	if(f->Folders == NULL)
+	{
+		return;
+	}
+
 	// Remove all subfolders
 	num = LIST_NUM(f->Folders);
 	ff = Malloc(sizeof(FOLDER *) * num);