Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 69065)
+++ channels/chan_sip.c	(working copy)
@@ -7494,7 +7494,7 @@
 	}
 	/* This new INVITE is part of an attended transfer. Make sure that the
 	other end knows and replace the current call with this new call */
-	if (p->options && p->options->replaces && !ast_strlen_zero(p->options->replaces)) {
+	if (p->options && !ast_strlen_zero(p->options->replaces)) {
 		add_header(&req, "Replaces", p->options->replaces);
 		add_header(&req, "Require", "replaces");
 	}
@@ -15025,7 +15025,7 @@
 			pbx_builtin_setvar_helper(current.chan2, "_SIPTRANSFER_REFERER", p->refer->referred_by);
 	}
 	/* Generate a Replaces string to be used in the INVITE during attended transfer */
-	if (p->refer->replaces_callid && !ast_strlen_zero(p->refer->replaces_callid)) {
+	if (!ast_strlen_zero(p->refer->replaces_callid)) {
 		char tempheader[BUFSIZ];
 		snprintf(tempheader, sizeof(tempheader), "%s%s%s%s%s", p->refer->replaces_callid, 
 				p->refer->replaces_callid_totag ? ";to-tag=" : "", 
Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 69068)
+++ main/pbx.c	(working copy)
@@ -3746,7 +3746,7 @@
 	/* Variables used for different counters */
 	struct dialplan_counters counters;
 
-	if (id && !ast_strlen_zero(id))
+	if (!ast_strlen_zero(id))
 		snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
 	else
 		idtext[0] = '\0';