diff --git a/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c b/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c
index bb7ce873..e73ac994 100755
--- a/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c
+++ b/usr/lib/pkcs11/ica_s390_stdll/ica_specific.c
@@ -2342,7 +2342,7 @@ token_specific_get_mechanism_list(CK_MECHANISM_TYPE_PTR pMechanismList,
 	int rc = CKR_OK;
 	struct mech_list_item head;
 	struct mech_list_item *walker;
-/*	syslog(LOG_ERR, "%s: Enter\n", __FUNCTION__); */
+	head.next = NULL;
 #if 1
 	rc = ock_generic_get_mechanism_list(pMechanismList, pulCount);	
 	if (rc != CKR_OK) {
@@ -2384,8 +2384,7 @@ token_specific_get_mechanism_list(CK_MECHANISM_TYPE_PTR pMechanismList,
 	}
 #endif
  out:
-/*	syslog(LOG_ERR, "%s: Exit; *pulCount = [%lu]\n", __FUNCTION__, 
-	(*pulCount)); */
+	free_mech_list(&head);
 	return rc;
 }
 
@@ -2424,6 +2423,5 @@ token_specific_get_mechanism_info(CK_MECHANISM_TYPE type,
 	}
  out:
 	free_mech_list(&head);
-/*	syslog(LOG_ERR, "%s: Exit\n", __FUNCTION__); */
 	return rc;
 }