Handle errors better for DCD