further tighten rescue for error tests