fixed NPE; prep and addition of /playlist;