diff --git a/reactos/dll/win32/devmgr/advprop.c b/reactos/dll/win32/devmgr/advprop.c
index 5070280b3f4..6be5f1b5a7d 100644
--- a/reactos/dll/win32/devmgr/advprop.c
+++ b/reactos/dll/win32/devmgr/advprop.c
@@ -319,6 +319,7 @@ DriverDetailsDlgProc(IN HWND hwndDlg,
             {
                 LV_COLUMN lvc;
                 HWND hDriversListView;
+                WCHAR szBuffer[260];
 
                 dap = (PDEVADVPROP_INFO)lParam;
                 if (dap != NULL)
@@ -341,6 +342,13 @@ DriverDetailsDlgProc(IN HWND hwndDlg,
                     UpdateDriverDetailsDlg(hwndDlg,
                                            hDriversListView,
                                            dap);
+
+                    if (ListView_GetItemCount(hDriversListView) == 0)
+                    {
+                        if(LoadStringW(hDllInstance, IDS_NODRIVERS, szBuffer, _countof(szBuffer)))
+                            MessageBoxW(hwndDlg, szBuffer, dap->szDevName, MB_OK);
+                        EndDialog(hwndDlg, IDCANCEL);
+                    }
                 }
 
                 Ret = TRUE;
diff --git a/reactos/dll/win32/devmgr/hwpage.c b/reactos/dll/win32/devmgr/hwpage.c
index 1d28dcc1691..2d7eae63389 100644
--- a/reactos/dll/win32/devmgr/hwpage.c
+++ b/reactos/dll/win32/devmgr/hwpage.c
@@ -962,8 +962,8 @@ HardwareDlgProc(IN HWND hwndDlg,
 
             case WM_DESTROY:
             {
-            	/* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */
-            	SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL);
+                /* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */
+                SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL);
                 
                 /* free devices list */
                 FreeDevicesList(hpd);
diff --git a/reactos/dll/win32/devmgr/precomp.h b/reactos/dll/win32/devmgr/precomp.h
index 29f46314533..0c6593dfa3d 100644
--- a/reactos/dll/win32/devmgr/precomp.h
+++ b/reactos/dll/win32/devmgr/precomp.h
@@ -2,6 +2,7 @@
 #define __DEVMGR_H
 
 #include <stdarg.h>
+#include <stdlib.h> 
 
 #define WIN32_NO_STATUS
 #include <windef.h>