Make code more robust.