diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml
index 83449ee31f4..288824ba93b 100644
--- a/src/modules/siptrace/doc/siptrace_admin.xml
+++ b/src/modules/siptrace/doc/siptrace_admin.xml
@@ -19,7 +19,7 @@
 		The SIPtrace module offer a possibility to store incoming and outgoing SIP
 		messages in a database and/or duplicate to the capturing server (using <acronym>HEP</acronym>,
 		the Homer encapsulation protocol, or plain SIP mode). Since version 5.4 new levels of tracing
-		are available. Transactions and dialogs can be traced. Trace flag is now useless.
+		are available. Transactions and dialogs can be traced.
 	</para>
 	<para>
 		There are multiple ways of storing information:
diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c
index fae818ec43c..7bfa5a60ee9 100644
--- a/src/modules/siptrace/siptrace.c
+++ b/src/modules/siptrace/siptrace.c
@@ -750,6 +750,10 @@ static int fixup_siptrace(void **param, int param_no)
 		}
 
 		*param = pkg_malloc(sizeof(trace_type));
+		if (*param == NULL) {
+			LM_ERR("no more pkg memory!\n");
+			return -1;
+		}
 		memcpy(*param, &trace_type, sizeof(trace_type));
 	}
 
@@ -758,12 +762,10 @@ static int fixup_siptrace(void **param, int param_no)
 
 
 /**
- * TODO TODO TODO:
  *
  * parse_siptrace_uri (to replace siptrace_fixup and ki_sip_trace_dst_cid beginning)
  * parse_siptrace_type
  *
- *
  */
 
 static int parse_siptrace_uri(str* duri, dest_info_t* dst)
@@ -1535,7 +1537,6 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps)
 
 	if (info->uriState == STRACE_RAW_URI) {
 		LM_BUG("uriState must be either UNUSED or PARSED here! must be a bug! Message won't be traced!\n");
-		abort();
 		return;
 	}
 
diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c
index c8b2051385a..aeaef830caf 100644
--- a/src/modules/siptrace/siptrace_send.c
+++ b/src/modules/siptrace/siptrace_send.c
@@ -268,14 +268,13 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2)
 
 	/* either modparam dup_uri or siptrace param dst2 */
 	if((dup_uri_str.s == 0 || dup_uri == NULL) && (dst2 == NULL)) {
-		LM_INFO("XXX: here s where we've got problems!\n");
+		LM_WARN("Neither dup_uri modparam or siptrace destination uri param used!\n");
 		return 0;
 	}
 
 	init_dest_info(&dst);
 
 	if(!dst2) {
-		LM_INFO("XXX: using default dup uri!\n");
 		/* create a temporary proxy from dst param */
 		dst.proto = PROTO_UDP;
 		p = mk_proxy(&dup_uri->host,