Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -N -r4c272b19c74694c428c943011f279ec064fbd894 -rebabad67cdda34ed4e36ab794e10d0ade8124bf3
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 4c272b19c74694c428c943011f279ec064fbd894)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3)
@@ -757,6 +757,9 @@
 // sets text in comboboxex edit and updates icon
 void CFolderDialog::SetComboPath(LPCTSTR lpszPath)
 {
+	_ASSERTE(lpszPath);
+	if(!lpszPath)
+		return;
 	// set current select to -1
 	m_bIgnoreTreeRefresh=true;
 	m_ctlPath.SetCurSel(-1);
@@ -1277,6 +1280,9 @@
 // opens choose folder dialog
 int BrowseForFolder(CFolderDialog::BROWSEDATA* pData, LPTSTR pszPath)
 {
+	_ASSERTE(pData && pszPath);
+	if(!pData || !pszPath)
+		return IDCANCEL;
 	ASSERT(pData);
 	ASSERT(pszPath);
 	CFolderDialog dlg;