diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs
index 12204660..a4adbafe 100644
--- a/FModel/MainWindow.cs
+++ b/FModel/MainWindow.cs
@@ -1138,7 +1138,7 @@ namespace FModel
                 BundleDesign.drawBackground(bmp, bundleParser);
             }
 
-            if (BundleInfos.BundleData.Count > 0 && BundleInfos.BundleData[0].rewardItemId != null && string.Equals(BundleInfos.BundleData[0].rewardItemId, "AthenaFortbyte", StringComparison.CurrentCultureIgnoreCase))
+            if (BundleInfos.BundleData[0].rewardItemId != null && string.Equals(BundleInfos.BundleData[0].rewardItemId, "AthenaFortbyte", StringComparison.CurrentCultureIgnoreCase))
                 isFortbyte = true;
 
             // Fortbytes: Sort by number
diff --git a/FModel/Methods/IconGenerator/ChallengeGenerator/BundleDesign.cs b/FModel/Methods/IconGenerator/ChallengeGenerator/BundleDesign.cs
index 476ba512..127c7925 100644
--- a/FModel/Methods/IconGenerator/ChallengeGenerator/BundleDesign.cs
+++ b/FModel/Methods/IconGenerator/ChallengeGenerator/BundleDesign.cs
@@ -8,7 +8,6 @@ using System.Windows.Forms;
 using System;
 using Newtonsoft.Json.Linq;
 using FModel.Parser.LocResParser;
-using System.Diagnostics;
 
 namespace FModel
 {
diff --git a/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs b/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs
index d3db4b59..c88f8270 100644
--- a/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs
+++ b/FModel/Methods/IconGenerator/ChallengeGenerator/BundleInfos.cs
@@ -6,7 +6,6 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -113,6 +112,7 @@ namespace FModel
                                         }
 
                                         string newQuest = SearchResource.getTextByKey(descriptionKey, descriptionSource);
+                                        if (string.IsNullOrEmpty(newQuest)) { newQuest = " "; }
                                         if (newQuest != oldQuest && newCount != oldCount)
                                         {
                                             if (questParser[x].Rewards != null && !isFortbyte)