Moves exception handling into private method, add calls from shipping/billing/checkout
Only check exactly html file for product match