Updates for wizard handling framework

Update for exception handling hook