I found the same issue so I installed a redirection plug-in and then easily redirect all the block pages (and headers / footers) to the homepage or elsewhere.
It’s good for the /product/ -> /product-category/ issue too. If someone tries to update the url on a product page by removing the product slug leaving category – it leads to a 404. So I redirect those properly too. Example
Change /product/beanies/product-demo1/
To /product-category/beanies/
Here’s the free plug-in I use. It’s compatible with the theme – https://wordpress.org/plugins/redirection/