Fix error handling in wizard