Add a few more catch cases

"The Cloud" misses a lot of good cases.