WPF Wizard Sample from MSDN problem

See more:

C#

WPF

I'm creating a Wizard in my app using the method in the following MSDN sample :

http://msdn.microsoft.com/en-us/library/aa972123(v=VS.90).aspx[^]

This Wizard consists of a main Window, which calls a <navigationwindow> as a dialog. That NavigationWindow calls a series of <pagefunction> pages.

The only difference is my app already contains a <Frame> object (simliar to a <navigationwindow> object. So, my version of "WizardDialogBox.xaml.cs" is a <page> in my Frame (as are my <pagefunction>'s), rather than a <navigationwindow>. If I change it to a new <navigationwindow>, everything works fine.

However, being that it is a <page>, if I *cancel* the wizard, an exception is thrown, and my App is closed. The problem is in my version of the Sample's WizardLauncher.cs's wizardPage_Return method. It tries to do an OnReturn(null), and that's when it throws the exception, and kills the app. If I wrap that call around a try/catch, and bring up a MessageBox, everything will continue as normal, but I need to resolve this issue ASAP.

Any suggestions?