diff --git a/src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java b/src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java
index 2ad1db08..bc34b477 100644
--- a/src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java
+++ b/src/ch/blinkenlights/android/vanilla/RemoteControlImplICS.java
@@ -135,8 +135,7 @@ public class RemoteControlImplICS implements RemoteControl.Client {
 
 		remote.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
 		RemoteControlClient.MetadataEditor editor = remote.editMetadata(true);
-		if (song != null) {
-
+		if (song != null && song.artist != null && song.album != null) {
 			String artist_album = song.artist + " - " + song.album;
 			artist_album = (song.artist.length() == 0 ? song.album : artist_album); // no artist ? -> only display album
 			artist_album = (song.album.length() == 0 ? song.artist : artist_album); // no album ? -> only display artist