Prevented entity swapping from always raising errors.