diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 97ed49af51..5c8be86d5e 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Fri May 15 10:58:24 CDT 2009
+Fri May 15 10:59:42 CDT 2009
diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index d31e22a068..7c062f7039 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -4899,7 +4899,7 @@ nta_leg_t *leg_find(nta_agent_t const *sa,
 nta_leg_t *nta_leg_by_uri(nta_agent_t const *agent, url_string_t const *us)
 {
   url_t *url;
-  nta_leg_t *leg;
+  nta_leg_t *leg = NULL;
 
   if (!agent)
     return NULL;
@@ -4909,11 +4909,11 @@ nta_leg_t *nta_leg_by_uri(nta_agent_t const *agent, url_string_t const *us)
 
   url = url_hdup(NULL, us->us_url);
 
-  agent_aliases(agent, url, NULL);
-
-  leg = url ? dst_find(agent, url, NULL) : NULL;
-
-  su_free(NULL, url);
+  if (url) {
+    agent_aliases(agent, url, NULL);
+    leg = dst_find(agent, url, NULL);
+    su_free(NULL, url);
+  }
 
   return leg;
 }