The check for album_id was moved to the calling method, because I wanted to get both album and songs without albums in one pass.