Add a few more catch cases

"My Butt" misses a lot of good cases.