Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -N -r37a273b73ad2ba80df122121bc36c7a11a5492bc -rebabad67cdda34ed4e36ab794e10d0ade8124bf3
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 37a273b73ad2ba80df122121bc36c7a11a5492bc)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3)
@@ -97,6 +97,8 @@
 	// copy shortcut and recent paths
 	icpf::config* pConfig = GetConfig();
 	assert(pConfig);
+	if(!pConfig)
+		return FALSE;
 
 	m_cvRecent.clear(true);
 	size_t stSize = pConfig->get_value_count(PP_RECENTPATHS);
@@ -497,6 +499,9 @@
 
 CString COptionsDlg::MakeCompoundString(UINT uiBase, int iCount, LPCTSTR lpszSeparator)
 {
+	assert(lpszSeparator);
+	if(!lpszSeparator)
+		return _T("");
 	_tcscpy(m_szBuffer, GetResManager()->LoadString(uiBase+0));
 	for (int i=1;i<iCount;i++)
 	{