Index: src/ch/PropertyListCtrl.cpp
===================================================================
diff -u -N -rc435ab507c8b8280264188b49e9ada56d46c0261 -rcca9305ba5a3910164a8cdd24fe3f63cd8089883
--- src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision c435ab507c8b8280264188b49e9ada56d46c0261)
+++ src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision cca9305ba5a3910164a8cdd24fe3f63cd8089883)
@@ -336,6 +336,9 @@
 	CRect TempRect = m_CurRect;
 	MapWindowPoints(GetDesktopWindow(), TempRect);
 
+	if(!m_pCurItem)
+		return;
+
 	// Display the Correct Control
 	switch(m_pCurItem->nType)
 	{
@@ -401,6 +404,10 @@
 	// Display the Correct Control
 	CRect TempRect = m_CurRect;
 	TempRect.InflateRect(-1,-1);
+
+	if(!m_pCurItem)
+		return;
+
 	switch(m_pCurItem->nType)
 	{
 		case	ID_PROPERTY_TEXT: