Make the converter more robust.