diff --git a/disk-image.c b/disk-image.c
index 80999c1..4099720 100644
--- a/disk-image.c
+++ b/disk-image.c
@@ -90,6 +90,10 @@ struct disk_image *disk_image__open(const char *filename)
 
 void disk_image__close(struct disk_image *self)
 {
+	/* If there was no disk image then there's nothing to do: */
+	if (!self)
+		return;
+
 	if (self->ops->close)
 		self->ops->close(self);