diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 5cdf80289..41f303093 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -269,6 +269,11 @@ namespace SixLabors.ImageSharp.Formats.Png
                     }
                 }
 
+                if (image == null)
+                {
+                    throw new ImageFormatException("PNG Image does not contain a data chunk");
+                }
+
                 return image;
             }
             finally