Fix product path to handle a None which

Add a check for which not being None before calling startswith.