Improve wizard error handling