Fixed error - cds.product can be none