Now throws correct error on block id conflicts