diff --git a/src/main/java/com/eu/habbo/util/imager/badges/BadgeImager.java b/src/main/java/com/eu/habbo/util/imager/badges/BadgeImager.java
index fb9436ec..2872cad8 100644
--- a/src/main/java/com/eu/habbo/util/imager/badges/BadgeImager.java
+++ b/src/main/java/com/eu/habbo/util/imager/badges/BadgeImager.java
@@ -53,18 +53,9 @@ public class BadgeImager {
                 float red = (color.getRed() / 255.0F) * (maskColor.getRed() / 255.0F);
                 float green = (color.getGreen() / 255.0F) * (maskColor.getGreen() / 255.0F);
                 float blue = (color.getBlue() / 255.0F) * (maskColor.getBlue() / 255.0F);
-//
-
-
-//
-
-
-//
-
 
                 color = new Color(red, green, blue, alpha);
 
-
                 int rgb = color.getRGB();
                 image.setRGB(x, y, rgb);
             }
@@ -209,6 +200,8 @@ public class BadgeImager {
                 part = Emulator.getGameEnvironment().getGuildManager().getPart(GuildPartType.SYMBOL, id);
             }
 
+            if (part == null) continue;
+
             BufferedImage imagePart = BadgeImager.deepCopy(this.cachedImages.get(part.valueA));
 
             Point point;