diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c
index c0bebd9bb..1cb210825 100644
--- a/src/cdrom/cdrom_image_backend.c
+++ b/src/cdrom/cdrom_image_backend.c
@@ -685,8 +685,8 @@ cdi_add_track(cd_img_t *cdi, track_t *cur, uint64_t *shift, uint64_t prestart, u
 
     if ((cdi->tracks != NULL) && (cdi->tracks_num != 0))
 	prev = &cdi->tracks[cdi->tracks_num - 1];
-    else if ((cdi->tracks != NULL) && (cdi->tracks_num == 0)) {
-	fatal("Non-NULL cdi->tracks with tracks_num being 0\n");
+    else if ((cdi->tracks == NULL) && (cdi->tracks_num != 0)) {
+	fatal("NULL cdi->tracks with non-zero cdi->tracks_num\n");
 	return 0;
     }