diff --git a/src/modules/acc_diameter/acc_diameter_mod.c b/src/modules/acc_diameter/acc_diameter_mod.c
index 3a35fe7e930..5bdf0765dce 100644
--- a/src/modules/acc_diameter/acc_diameter_mod.c
+++ b/src/modules/acc_diameter/acc_diameter_mod.c
@@ -180,7 +180,7 @@ static int child_init(int rank)
 	rb = (rd_buf_t*)pkg_malloc(sizeof(rd_buf_t));
 	if(!rb)
 	{
-		LM_DBG("no more pkg memory\n");
+		PKG_MEM_ERROR;
 		return -1;
 	}
 	rb->buf = 0;
@@ -223,7 +223,7 @@ static int acc_api_fixup(void** param, int param_no)
 	if (param_no == 1) {
 		accp = (struct acc_param*)pkg_malloc(sizeof(struct acc_param));
 		if (!accp) {
-			LM_ERR("no more pkg mem\n");
+			PKG_MEM_ERROR;
 			return E_OUT_OF_MEM;
 		}
 		memset( accp, 0, sizeof(struct acc_param));
@@ -544,7 +544,7 @@ int extra2strar(struct acc_extra *extra, sip_msg_t *rq, str *val_arr,
 		} else {
 			val_arr[n].s = (char *)pkg_malloc(value.rs.len);
 			if (val_arr[n].s == NULL ) {
-				LM_ERR("out of memory.\n");
+				PKG_MEM_ERROR;
 				/* Cleanup already allocated memory and
 				 * return that we didn't do anything */
 				for (i = 0; i < n ; i++) {
diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c
index 038f6c8eba2..f8ad15a525e 100644
--- a/src/modules/acc_diameter/diam_avp.c
+++ b/src/modules/acc_diameter/diam_avp.c
@@ -118,8 +118,10 @@ AAA_AVP*  AAACreateAVP(
 	/* allocated a new AVP struct */
 	avp = 0;
 	avp = (AAA_AVP*)ad_malloc(sizeof(AAA_AVP));
-	if (!avp)
+	if (!avp) {
+		PKG_MEM_ERROR;
 		goto error;
+	}
 	memset( avp, 0, sizeof(AAA_AVP) );
 
 	/* set some fields */
@@ -134,8 +136,10 @@ AAA_AVP*  AAACreateAVP(
 		/* make a duplicate for data */
 		avp->data.len = length;
 		avp->data.s = (void*)ad_malloc(length);
-		if(!avp->data.s)
+		if(!avp->data.s) {
+			PKG_MEM_ERROR;
 			goto error;
+		}
 		memcpy( avp->data.s, data, length);
 		avp->free_it = 1;
 	} else {
@@ -428,7 +432,7 @@ AAA_AVP* AAACloneAVP( AAA_AVP *avp , unsigned char clone_data)
 	/* clone the avp structure */
 	n_avp = (AAA_AVP*)ad_malloc( sizeof(AAA_AVP) );
 	if (!n_avp) {
-		LM_ERR("cannot get free memory!!\n");
+		PKG_MEM_ERROR;
 		goto error;
 	}
 	memcpy( n_avp, avp, sizeof(AAA_AVP));
@@ -438,7 +442,7 @@ AAA_AVP* AAACloneAVP( AAA_AVP *avp , unsigned char clone_data)
 		/* clone the avp data */
 		n_avp->data.s = (char*)ad_malloc( avp->data.len );
 		if (!(n_avp->data.s)) {
-			LM_ERR("cannot get free memory!!\n");
+			PKG_MEM_ERROR;
 			ad_free( n_avp );
 			goto error;
 		}
diff --git a/src/modules/acc_diameter/diam_message.c b/src/modules/acc_diameter/diam_message.c
index 841dfe16a53..7388f44c93c 100644
--- a/src/modules/acc_diameter/diam_message.c
+++ b/src/modules/acc_diameter/diam_message.c
@@ -71,7 +71,7 @@ AAAReturnCode AAABuildMsgBuffer( AAAMessage *msg )
 	/* allocate some memory */
 	msg->buf.s = (char*)ad_malloc( msg->buf.len );
 	if (!msg->buf.s) {
-		LM_ERR("no more pkg free memory!\n");
+		PKG_MEM_ERROR;
 		goto error;
 	}
 	memset(msg->buf.s, 0, msg->buf.len);
@@ -213,7 +213,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen,
 	/* alloc a new message structure */
 	msg = (AAAMessage*)ad_malloc(sizeof(AAAMessage));
 	if (!msg) {
-		LM_ERR("no more pkg free memory!!\n");
+		PKG_MEM_ERROR;
 		goto error;
 	}
 	memset(msg,0,sizeof(AAAMessage));
@@ -351,7 +351,7 @@ AAAMessage* AAAInMessage(AAACommandCode cmdCode,
 	/* allocated a new AAAMessage structure a set it to 0 */
 	msg = (AAAMessage*)ad_malloc(sizeof(AAAMessage));
 	if (!msg) {
-		LM_ERR("no more pkg free memory!\n");
+		PKG_MEM_ERROR;
 		return NULL;
 	}
 	memset(msg, 0, sizeof(AAAMessage));
diff --git a/src/modules/acc_diameter/diam_tcp.c b/src/modules/acc_diameter/diam_tcp.c
index 59b8755ce25..b73483b8ee6 100644
--- a/src/modules/acc_diameter/diam_tcp.c
+++ b/src/modules/acc_diameter/diam_tcp.c
@@ -246,7 +246,7 @@ int do_read( int socket, rd_buf_t *p)
 				//LM_DBG("message length = %d(%x)\n",len,len);
 				if ( (p->buf=pkg_malloc(len))==0  )
 				{
-					LM_ERR("no more pkg memory\n");
+					PKG_MEM_ERROR;
 					goto error;
 				}
 				*((unsigned int*)p->buf) = p->first_4bytes;