diff --git a/modules/presence/notify.c b/modules/presence/notify.c
index 5115b6a48f2..ba36837f0cc 100644
--- a/modules/presence/notify.c
+++ b/modules/presence/notify.c
@@ -1083,9 +1083,9 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, str* publ_body
 
 			if(row_vals[extra_hdrs_col].val.string_val!= NULL)
 			{
-				if (extra_hdrs && !extra_hdrs->s)
+				len = strlen(row_vals[extra_hdrs_col].val.string_val);
+				if (len > 0 && extra_hdrs && !extra_hdrs->s)
 				{
-					len = strlen(row_vals[extra_hdrs_col].val.string_val);
 					extra_hdrs->s = (char*)pkg_malloc(len);
 					if (extra_hdrs->s == NULL)
 					{
@@ -1151,9 +1151,9 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, str* publ_body
 
 				if(row_vals[extra_hdrs_col].val.string_val!= NULL)
 				{
-					if (extra_hdrs && !extra_hdrs->s)
+					len = strlen(row_vals[extra_hdrs_col].val.string_val);
+					if (len > 0 && extra_hdrs && !extra_hdrs->s)
 					{
-						len = strlen(row_vals[extra_hdrs_col].val.string_val);
 						extra_hdrs->s = (char*)pkg_malloc(len);
 						if (extra_hdrs->s == NULL)
 						{
@@ -1203,9 +1203,9 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, str* publ_body
 
 				if(row_vals[extra_hdrs_col].val.string_val!= NULL)
 				{
-					if (extra_hdrs && !extra_hdrs->s)
+					len = strlen(row_vals[extra_hdrs_col].val.string_val);
+					if (len > 0 && extra_hdrs && !extra_hdrs->s)
 					{
-						len = strlen(row_vals[extra_hdrs_col].val.string_val);
 						extra_hdrs->s = (char*)pkg_malloc(len);
 						if (extra_hdrs->s == NULL)
 						{