diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 0d80678..016c109 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -1013,7 +1013,8 @@
     static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data );
 
     TRACE("(%p,%s,%p,%p,%p,%p=%ld)\n",
-          hkey, debugstr_w(name), reserved, type, data, count, count ? *count : 0 );
+          hkey, debugstr_w(name), reserved, type, data, count,
+          (count && data) ? *count : 0 );
 
     if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
     if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;
diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c
index f484be1..9458b35 100644
--- a/dlls/ntdll/resource.c
+++ b/dlls/ntdll/resource.c
@@ -275,7 +275,8 @@
 
     if (info) TRACE( "module %p type %s name %s lang %04lx level %ld\n",
                      hmod, debugstr_w((LPCWSTR)info->Type),
-                     debugstr_w((LPCWSTR)info->Name), info->Language, level );
+                     level > 1 ? debugstr_w((LPCWSTR)info->Name) : "",
+                     level > 2 ? info->Language : 0, level );
 
     __TRY
     {
@@ -302,7 +303,8 @@
 
     if (info) TRACE( "module %p type %s name %s lang %04lx level %ld\n",
                      hmod, debugstr_w((LPCWSTR)info->Type),
-                     debugstr_w((LPCWSTR)info->Name), info->Language, level );
+                     level > 1 ? debugstr_w((LPCWSTR)info->Name) : "",
+                     level > 2 ? info->Language : 0, level );
 
     __TRY
     {