diff --git a/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java b/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
index d41dea3d..5e4c7de6 100644
--- a/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
+++ b/src/main/java/eu/crushedpixel/replaymod/assets/CustomImageObject.java
@@ -88,7 +88,7 @@ public class CustomImageObject implements GuiEntryListEntry {
             }
         }
 
-        if(!ResourceHelper.isRegistered(resourceLocation)) {
+        if(resourceLocation != null && !ResourceHelper.isRegistered(resourceLocation)) {
             ResourceHelper.registerResource(resourceLocation);
             Minecraft.getMinecraft().getTextureManager().loadTexture(resourceLocation, dynamicTexture);
             dynamicTexture.updateDynamicTexture();
diff --git a/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java b/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
index df3e3f78..9e355b38 100644
--- a/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
+++ b/src/main/java/eu/crushedpixel/replaymod/assets/ReplayImageAsset.java
@@ -49,7 +49,7 @@ public class ReplayImageAsset implements ReplayAsset<BufferedImage> {
         ResourceHelper.freeResource(previewResource);
 
         for(CustomImageObject object : ReplayHandler.getCustomImageObjects()) {
-            if(object.getLinkedAsset().equals(ReplayHandler.getAssetRepository().getUUIDForAsset(this))) {
+            if(object.getLinkedAsset() != null && object.getLinkedAsset().equals(ReplayHandler.getAssetRepository().getUUIDForAsset(this))) {
                 object.setImage(this.object);
             }
         }