diff --git a/persistence/nowplaying_repository.go b/persistence/nowplaying_repository.go
index 094c063ee..cdf241816 100644
--- a/persistence/nowplaying_repository.go
+++ b/persistence/nowplaying_repository.go
@@ -59,6 +59,9 @@ func (r *nowPlayingRepository) Head(playerId int) (*engine.NowPlayingInfo, error
 // TODO Will not work for multiple players
 func (r *nowPlayingRepository) GetAll() ([]*engine.NowPlayingInfo, error) {
 	np, err := r.Head(1)
+	if np == nil || err != nil {
+		return nil, err
+	}
 	return []*engine.NowPlayingInfo{np}, err
 }