diff --git a/reactos/lib/atl/atlbase.h b/reactos/lib/atl/atlbase.h
index df2175c0ea0..b2f6ae1f3df 100644
--- a/reactos/lib/atl/atlbase.h
+++ b/reactos/lib/atl/atlbase.h
@@ -617,6 +617,11 @@ public:
 				objectMapEntry++;
 			}
 		}
+		if (hResult == S_OK && *ppv == NULL)
+		{
+			// FIXME: call AtlComModuleGetClassObject
+			hResult = CLASS_E_CLASSNOTAVAILABLE;
+		}
 		return hResult;
 	}