Merge "Fix exception in Import, when import of a revision fails"