Back port to last known non-error