Fix bad code + safety check for no album