diff --git a/include/WinStd/BCrypt.h b/include/WinStd/BCrypt.h
index edb31ea4..2395a0af 100644
--- a/include/WinStd/BCrypt.h
+++ b/include/WinStd/BCrypt.h
@@ -125,7 +125,7 @@ namespace winstd
             if (this != std::addressof(h)) {
                 if (m_h != invalid)
                     free_internal();
-                if (h)
+                if (h.valid())
                     duplicate_internal(h);
                 else
                     m_h = invalid;
diff --git a/include/WinStd/COM.h b/include/WinStd/COM.h
index ba8429be..bbd7eb0c 100644
--- a/include/WinStd/COM.h
+++ b/include/WinStd/COM.h
@@ -1665,7 +1665,7 @@ namespace winstd
             };
             sa = SafeArrayCreate(VT_VARIANT, _countof(dim), dim);
         }
-        if (!sa)
+        if (!sa.valid())
             throw std::bad_alloc();
 
         assert(SafeArrayGetElemsize(sa) == sizeof(VARIANT));