IMP Better error code matching