Hotfixes for my queue changes that won't explode if you delete datasets anymore
Merge pull request #681 from jaypoulz/hamster

Hotfixes for my queue changes that won't explode if you delete datasets ...