Index: dll/win32/shell32/folders/CFSFolder.cpp
===================================================================
--- dll/win32/shell32/folders/CFSFolder.cpp	(revision 73854)
+++ dll/win32/shell32/folders/CFSFolder.cpp	(working copy)
@@ -1064,9 +1064,11 @@
     {
         CLSID clsid;
         hr = CLSIDFromString(wszName, &clsid);
-        if (hr == S_OK)
-            pwszClsid = wszName;
+        if (FAILED(hr))
+            return hr;
 
+        pwszClsid = wszName;
+
         if (m_bGroupPolicyActive)
         {
             if (RegGetValueW(HKEY_LOCAL_MACHINE,