diff --git a/src/org/kreed/vanilla/CoverView.java b/src/org/kreed/vanilla/CoverView.java
index 782cd567..e28dc89d 100644
--- a/src/org/kreed/vanilla/CoverView.java
+++ b/src/org/kreed/vanilla/CoverView.java
@@ -314,6 +314,9 @@ public final class CoverView extends View implements Handler.Callback {
 	 */
 	private void generateBitmap(Song song)
 	{
+		if (song == null)
+			return;
+
 		Bitmap bitmap = mBitmapCache.get(song.id);
 		if (bitmap == null) {
 			bitmap = mBitmapCache.discardOldest();