Should catch three errors we saw.  COULD be more, but if there are, I'm not aware of them yet.
Ummmn... I'm not sure what the failure was on bocce, but this should fix it