Merge pull request #1625 from anandpdoshi/hotfix

Added hook: setup_wizard_exception