Add null check for artist