diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index a2ef430568..d6046ed570 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -394,9 +394,9 @@ void sofia_event_callback(nua_event_t event,
 											(char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0,
 											REG_INVITE, NULL);
 		}
-
+		
 		if (auth_res != AUTH_OK) {
-			switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+			//switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
 			nua_respond(nh, SIP_401_UNAUTHORIZED, TAG_END());
 			goto done;
 		}
diff --git a/src/switch_scheduler.c b/src/switch_scheduler.c
index 3e7dc4d3d5..b7b9ea8f7e 100644
--- a/src/switch_scheduler.c
+++ b/src/switch_scheduler.c
@@ -285,9 +285,11 @@ SWITCH_DECLARE(uint32_t) switch_scheduler_del_task_group(const char *group)
 	return delcnt;
 }
 
+switch_thread_t *task_thread_p = NULL;
+
 SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void)
 {
-	switch_thread_t *thread;
+
 	switch_threadattr_t *thd_attr;
 
 	switch_core_new_memory_pool(&globals.memory_pool);
@@ -295,7 +297,7 @@ SWITCH_DECLARE(void) switch_scheduler_task_thread_start(void)
 	switch_mutex_init(&globals.task_mutex, SWITCH_MUTEX_NESTED, globals.memory_pool);
 
 	switch_threadattr_detach_set(thd_attr, 1);
-	switch_thread_create(&thread, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
+	switch_thread_create(task_thread_p, thd_attr, switch_scheduler_task_thread, NULL, globals.memory_pool);
 }
 
 SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)
@@ -303,8 +305,11 @@ SWITCH_DECLARE(void) switch_scheduler_task_thread_stop(void)
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping Task Thread\n");
 	if (globals.task_thread_running == 1) {
 		int sanity = 0;
+		switch_status_t st;
 
 		globals.task_thread_running = -1;
+		
+		switch_thread_join(&st, task_thread_p);
 
 		while (globals.task_thread_running) {
 			switch_yield(100000);
diff --git a/src/switch_time.c b/src/switch_time.c
index 7cfa303482..cf69a3410e 100644
--- a/src/switch_time.c
+++ b/src/switch_time.c
@@ -174,7 +174,7 @@ SWITCH_DECLARE(void) switch_micro_sleep(switch_interval_time_t t)
 SWITCH_DECLARE(void) switch_sleep(switch_interval_time_t t)
 {
 
-	if (t < 1000 || t >= 10000) {
+	if (!globals.RUNNING || t < 1000 || t >= 10000) {
 		do_sleep(t);
 		return;
 	}