diff --git a/reactos/dll/win32/devmgr_new/CMakeLists.txt b/reactos/dll/win32/devmgr_new/CMakeLists.txt
index b4047338469..26995fc1634 100644
--- a/reactos/dll/win32/devmgr_new/CMakeLists.txt
+++ b/reactos/dll/win32/devmgr_new/CMakeLists.txt
@@ -5,8 +5,8 @@ set_cpp(WITH_RTTI WITH_RUNTIME)
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/dll
-	${REACTOS_SOURCE_DIR}/lib/atl 
-	includes)
+    ${REACTOS_SOURCE_DIR}/lib/atl 
+    includes)
 
 list(APPEND SOURCE
     stdafx.h
diff --git a/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp b/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp
index b15ce5a49ba..db71ff2a88f 100644
--- a/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp
+++ b/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp
@@ -116,6 +116,7 @@ CDeviceNode::SetupNode()
                               &m_ClassGuid,
                               &m_ClassImage);
 
+
     // Get the description for the device
     ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR);
     cr = CM_Get_DevNode_Registry_PropertyW(m_DevInst,
@@ -136,11 +137,11 @@ CDeviceNode::SetupNode()
 
     }
 
-    // Cleanup if something failed
     if (cr != CR_SUCCESS)
     {
-        Cleanup();
-        return false;
+        CAtlStringW str;
+        if (str.LoadStringW(g_hThisInstance, IDS_UNKNOWNDEVICE))
+            StringCchCopyW(m_DisplayName, MAX_PATH, str.GetBuffer());
     }
 
     return true;
diff --git a/reactos/dll/win32/devmgr_new/stdafx.h b/reactos/dll/win32/devmgr_new/stdafx.h
index 3ed79c778b1..cd03b01e6e3 100644
--- a/reactos/dll/win32/devmgr_new/stdafx.h
+++ b/reactos/dll/win32/devmgr_new/stdafx.h
@@ -24,6 +24,8 @@
 
 #define ERR printf
 #define FIXME printf
+#define UNIMPLEMENTED
+#define WINE_DEFAULT_DEBUG_CHANNEL(t)
 
 DWORD WINAPI pSetupGuidFromString(PCWSTR pString, LPGUID lpGUID);