From fad356b88df772445f078f978eca152de630369e Mon Sep 17 00:00:00 2001
From: brianlagunas_cp <XceedBoucherS@users.noreply.github.com>
Date: Thu, 27 Oct 2011 16:21:32 +0000
Subject: [PATCH] PropertyGrid; fixed null exception when clicking the
 categorize and alphabetize buttons when the SelectedObject is null.

---
 .../PropertyGrid/Implementation/PropertyGrid.cs                | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
index 7502d665..de0e3276 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
@@ -366,6 +366,9 @@ namespace Microsoft.Windows.Controls.PropertyGrid
 
         private void LoadProperties(bool isCategorized)
         {
+            if (_propertyItemsCache == null)
+                return;
+
             //clear any filters first
             Filter = String.Empty;