diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs index 0834679e..b820aee1 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs @@ -512,6 +512,10 @@ namespace Microsoft.Windows.Controls private void Button_Click(object sender, RoutedEventArgs e) { Button button = e.OriginalSource as Button; + + if (button == null) + return; + switch (button.Name) { case "PART_NoButton":