Fix loading when error occured in wizard

Change-Id: Ice964afaf81217e24478ea03bc00a91f36d789b2
Merge "Fix loading when error occured in wizard"