diff --git a/sflphone-common/src/sip/sdp.cpp b/sflphone-common/src/sip/sdp.cpp
index 04a9630890f84d17f72e21714ebd8ec3b4e03b8c..6f208ef2e1a6cdb66ec402cac31016ab5daaa6e3 100644
--- a/sflphone-common/src/sip/sdp.cpp
+++ b/sflphone-common/src/sip/sdp.cpp
@@ -175,16 +175,24 @@ int Sdp::create_initial_offer()
     status = create_local_offer();
 
     if (status != PJ_SUCCESS) {
+	_debug ("    Error: Failled to create initial offer\n");
         return status;
     }
 
     // Create the SDP negociator instance with local offer
     status = pjmedia_sdp_neg_create_w_local_offer (_pool, get_local_sdp_session(), &_negociator);
 
+    if (status != PJ_SUCCESS) {
+	_debug ("    Error: Failled to create an initial SDP negociator\n");
+        return status;
+    }
+
     state = pjmedia_sdp_neg_get_state (_negociator);
 
     PJ_ASSERT_RETURN (status == PJ_SUCCESS, 1);
 
+    _debug ("    Initial offer created succesfully\n");
+
     return PJ_SUCCESS;
 }
 
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index 0ad3d3559d135a7cb87c460a84c7b48900284cef..9915bac602aac478989309d8ad4b76782f24fa19 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -357,7 +357,7 @@ std::string SIPVoIPLink::get_useragent_name (void)
 void
 SIPVoIPLink::getEvent()
 {
-    // We have to register the external thread so it could access the pjsip framework
+    // We have to register the external thread so it could access the pjsip frameworks
     if (!pj_thread_is_registered())
         pj_thread_register (NULL, desc, &thread);
 
@@ -1239,6 +1239,7 @@ SIPVoIPLink::SIPStartCall (SIPCall* call, const std::string& subject UNUSED)
     status = pjsip_inv_send_msg (inv, tdata);
 
     if (status != PJ_SUCCESS) {
+	_debug("    SIPStartCall: failed to send invite\n");
         return false;
     }
 
@@ -1632,6 +1633,8 @@ bool SIPVoIPLink::pjsip_init()
         _localExternAddress = Manager::instance().getFirewallAddress();
         _localExternPort = Manager::instance().getFirewallPort();        
     } else {
+	// Create a UDP listener meant for all accounts
+        // for which TLS was not enabled
         _localExternAddress = _localIPAddress;
         _localExternPort = _localPort;
         errPjsip = createUDPServer();
@@ -1639,7 +1642,7 @@ bool SIPVoIPLink::pjsip_init()
     
     // Create a UDP listener meant for all accounts
     // for which TLS was not enabled
-    errPjsip = createUDPServer();
+    // errPjsip = createUDPServer();
 
     // If stun was not enabled an the above UDP server
     // could not be created, then give it another try
@@ -1809,6 +1812,8 @@ int SIPVoIPLink::createUDPServer (void)
     pjsip_host_port a_name;
     char tmpIP[32];
 
+    _debug("Debug: createUDPServer called!\n");
+
     // Init bound address to ANY
     pj_memset (&bound_addr, 0, sizeof (bound_addr));
 
@@ -2207,11 +2212,15 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
     SIPCall * call = NULL;    
     call = reinterpret_cast<SIPCall*> (inv->mod_data[_mod_ua.id]);
 
-    _debug("    call_on_state_changed: call id %s\n", call->getCallId().c_str());
     if (call == NULL) {
         _debug("Call is NULL in call_on_state_changed");
         return;
     }
+    else
+    {
+	_debug("    call_on_state_changed: call id %s\n", call->getCallId().c_str());
+	_debug("    call_on_state_changed: call state %s\n", invitationStateMap[call->getInvSession()->state]);
+    }
 
     //Retrieve the body message
     rdata = e->body.tsx_state.src.rdata;
@@ -2239,6 +2248,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
         pjsip_evsub_state ev_state = PJSIP_EVSUB_STATE_ACTIVE;
 
         switch (call->getInvSession()->state) {
+	// switch (inv->state) {
 
             case PJSIP_INV_STATE_NULL: