diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c
index 74e9a2d42e7..e2e6e8d089c 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.c
@@ -832,7 +832,9 @@ PNP_GetClassName(handle_t BindingHandle,
 
     lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class");
     lstrcatW(szKeyName, L"\\");
-    lstrcatW(szKeyName, ClassGuid);
+    if(lstrlenW(ClassGuid) < sizeof(szKeyName)-lstrlenW(szKeyName))
+    	lstrcatW(szKeyName, ClassGuid);
+    else return CR_INVALID_DATA;
 
     if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
                       szKeyName,