Merge in BareException checking from @nirs