more crashproof album deletion
Merge pull request #314 from hurzl/upstream

more crashproof album deletion