PR changes, move errors out of method to call site, rename get_shape_set method