Moved the productId check from class constructor to the sanity check code.

The productId is only checked once by setting a flag.