Tolerate empty cases (even though that's just plain silly). Closes #624
Merge branch '97x' of github.com:nddrylliog/rock into 97x