handling for missng albums, code refactor