diff --git a/src/CoverView.cpp b/src/CoverView.cpp
index 73a11e1..2d8eb4e 100644
--- a/src/CoverView.cpp
+++ b/src/CoverView.cpp
@@ -75,11 +75,13 @@ CoverView::Pulse()
 		if (fCurrentSong.InitCheck()) {
 			fCurrentSong = song;
 			delete fCover;
+			fCover = NULL;
 			Invalidate();
 		}
 	} else if (song != fCurrentSong) {
 		fCurrentSong = song;
-		delete fCover;
+		if (fCover != NULL)
+			delete fCover;
 		fCover = song.Cover();
 		Invalidate();
 	}