diff --git a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
index 2e55fee0..9d10fc48 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
@@ -516,6 +516,8 @@ public class MediaAdapter
 		if (mFields.length > 1) {
 			String line1 = cursor.getString(1);
 			String line2 = cursor.getString(2);
+			if(line1 == null) { line1 = "???"; }
+			if(line2 == null) { line2 = "???"; }
 			SpannableStringBuilder sb = new SpannableStringBuilder(line1);
 			sb.append('\n');
 			sb.append(line2);
@@ -524,6 +526,7 @@ public class MediaAdapter
 			holder.title = line1;
 		} else {
 			String title = cursor.getString(1);
+			if(title == null) { title = "???"; }
 			holder.text.setText(title);
 			holder.title = title;
 		}