1.0.25.21: handling of potential corruptions