Improved Exceptional handling on products (#215)