Fix product path to handle a None which

Add a check for which not being None before calling startswith.
Merge pull request #1439 from elyezer/fix-product-path

Fix product path to handle a None which