diff --git a/src/EventEmitter.js b/src/EventEmitter.js
index 3ce46fefe..e3133d03d 100644
--- a/src/EventEmitter.js
+++ b/src/EventEmitter.js
@@ -142,8 +142,8 @@ EventEmitter.prototype = {
   * @param {Array} args
   */
   emit: function(event, sender, data) {
-    var listeners, length,
-      idx=0;
+    var listeners, length, 
+      emitter = this;
 
     if (!this.checkEvent(event)) {
       return;
@@ -156,23 +156,22 @@ EventEmitter.prototype = {
 
     var e = new JsSIP.Event(event, sender, data);
 
-    if (e) {
-      for (idx; idx<length; idx++) {
-        listeners[idx].apply(null, [e]);
-      }
-    } else {
-      for (idx; idx<length; idx++) {
-        listeners[idx].call();
-      }
-    }
-
-    // Check whether _once_ was defined for the event
-    idx = this.onceNotFired.indexOf(event);
-
-    if (idx !== -1) {
-      this.onceNotFired.splice(idx,1);
-      this.events[event].shift();
-    }
+    window.setTimeout(
+      function(){
+        var idx=0;
+        
+        for (idx; idx<length; idx++) {
+          listeners[idx].call(null, e);
+        }
+
+        // Check whether _once_ was defined for the event
+        idx = emitter.onceNotFired.indexOf(event);
+
+        if (idx !== -1) {
+          emitter.onceNotFired.splice(idx,1);
+          emitter.events[event].shift();
+        }
+      }, 0);
   },
 
   /**
diff --git a/src/UA.js b/src/UA.js
index 14acc7a55..b2b9eaea9 100644
--- a/src/UA.js
+++ b/src/UA.js
@@ -85,6 +85,7 @@ UA = function(configuration) {
   };
 
   this.transportRecoverAttempts = 0;
+  this.transportRecoveryTimer = null;
 
   /**
    * Load configuration
@@ -208,6 +209,9 @@ UA.prototype.stop = function() {
     console.warn('UA already closed');
     return;
   }
+  
+  // Clear transportRecoveryTimer
+  window.clearTimeout(this.transportRecoveryTimer);
 
   // Close registrator
   console.log(LOG_PREFIX +'closing registrator');
@@ -619,7 +623,7 @@ UA.prototype.recoverTransport = function(ua) {
 
   console.log(LOG_PREFIX + 'next connection attempt in '+ nextRetry +' seconds');
 
-  window.setTimeout(
+  this.transportRecoveryTimer = window.setTimeout(
     function(){
       ua.transportRecoverAttempts = count + 1;
       new JsSIP.Transport(ua, server);