diff --git a/cr_hsm_code.c b/cr_hsm_code.c
index ecb3403..30fb739 100644
--- a/cr_hsm_code.c
+++ b/cr_hsm_code.c
@@ -249,7 +249,7 @@ int hsm_initialize( void )
 
 	// load ecdsa dev keypair
 	ret_code = hsm_ecdsa_load_keypair( hsmEcdsaPrivkeyidentDev, &hsmEcdsaPrivkeyidDev,
-											NULL, &hsmEcdsaPubkeyidDev );
+											*(NFKM_KeyIdent*)NULL, &hsmEcdsaPubkeyidDev );
 	if ( ret_code != CR_GENID_SUCCESS )
 	{
 		SetErrorInfo( __FUNCTION__, __LINE__ );
@@ -258,7 +258,7 @@ int hsm_initialize( void )
 	
 	// load ecdsa prod keypair
 	ret_code = hsm_ecdsa_load_keypair( hsmEcdsaPrivkeyidentProd, &hsmEcdsaPrivkeyidProd,
-											NULL, &hsmEcdsaPubkeyidProd );
+											*(NFKM_KeyIdent*)NULL, &hsmEcdsaPubkeyidProd );
 	if ( ret_code != CR_GENID_SUCCESS )
 	{
 		SetErrorInfo( __FUNCTION__, __LINE__ );
@@ -763,7 +763,7 @@ int hsm_ecdsa_load_keypair( NFKM_KeyIdent privKeyident, M_KeyID *privKeyid,
 	}
 	
 	// priv
-	if ( privKeyident != NULL )
+	if ( &privKeyident != NULL )
 	{
 		// find key
 		ret_code = NFKM_findkey( hsmHandle, privKeyident, &keyinfo, NULL );
@@ -794,7 +794,7 @@ int hsm_ecdsa_load_keypair( NFKM_KeyIdent privKeyident, M_KeyID *privKeyid,
 	}	// priv
 
 	// pub
-	if ( pubKeyident != NULL )
+	if ( &pubKeyident != NULL )
 	{
 		// find key
 		ret_code = NFKM_findkey( hsmHandle, pubKeyident, &keyinfo, NULL );