diff --git a/src/pk/dh/dh.c b/src/pk/dh/dh.c
index d2b970b..ec14b6d 100644
--- a/src/pk/dh/dh.c
+++ b/src/pk/dh/dh.c
@@ -77,8 +77,8 @@ done:
 void dh_sizes(int *low, int *high)
 {
    int x;
-   LTC_ARGCHK(low != NULL);
-   LTC_ARGCHK(high != NULL);
+   LTC_ARGCHKVD(low != NULL);
+   LTC_ARGCHKVD(high != NULL);
    *low  = INT_MAX;
    *high = 0;
    for (x = 0; sets[x].size != 0; x++) {
@@ -187,7 +187,7 @@ error2:
 */
 void dh_free(dh_key *key)
 {
-   LTC_ARGCHK(key != NULL);
+   LTC_ARGCHKVD(key != NULL);
    if ( key->x ) {
 		mp_clear( key->x );
 		key->x = NULL;
diff --git a/src/pk/dh/dh_static.h b/src/pk/dh/dh_static.h
index 6473c3e..273b175 100644
--- a/src/pk/dh/dh_static.h
+++ b/src/pk/dh/dh_static.h
@@ -71,7 +71,7 @@
 
 static inline void packet_store_header (unsigned char *dst, int section, int subsection)
 {
-   LTC_ARGCHK(dst != NULL);
+   LTC_ARGCHKVD(dst != NULL);
 
    /* store version number */
    dst[0] = (unsigned char)(CRYPT&255);
diff --git a/src/pk/rsa/rsa_get_size.c b/src/pk/rsa/rsa_get_size.c
index 79556fe..dfc82b0 100644
--- a/src/pk/rsa/rsa_get_size.c
+++ b/src/pk/rsa/rsa_get_size.c
@@ -25,7 +25,7 @@
 int rsa_get_size(rsa_key *key)
 {
   int ret = INT_MAX;
-  LTC_ARGCHKVD(key != NULL);
+  LTC_ARGCHK(key != NULL);
 
   if (key)
   {
diff --git a/src/pk/rsa/rsa_sign_saltlen_get.c b/src/pk/rsa/rsa_sign_saltlen_get.c
index 5f0e68e..d549a4f 100644
--- a/src/pk/rsa/rsa_sign_saltlen_get.c
+++ b/src/pk/rsa/rsa_sign_saltlen_get.c
@@ -27,7 +27,7 @@
 int rsa_sign_saltlen_get_max_ex(int padding, int hash_idx, rsa_key *key)
 {
   int ret = INT_MAX;
-  LTC_ARGCHKVD(key != NULL);
+  LTC_ARGCHK(key != NULL);
 
   if ((hash_is_valid(hash_idx) == CRYPT_OK) &&
       (padding == LTC_PKCS_1_PSS))