diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 0499a7ca78..b67957b4e0 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -372,8 +372,8 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
 
 	su_root_run(profile->s_root);
 	nua_destroy(profile->nua);
-	while(0 && profile->inuse) {
-		switch_yield(1000000);
+	while(profile->inuse) {
+		switch_yield(100000);
 	}
 
 	if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) {
diff --git a/src/switch_channel.c b/src/switch_channel.c
index e876af85bf..32d61bdcb1 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -354,8 +354,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *cha
 
 SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key)
 {
-	assert(channel != NULL);
 	void *val;
+	assert(channel != NULL);
 	switch_mutex_lock(channel->profile_mutex);
 	val = switch_core_hash_find(channel->private_hash, key);
 	switch_mutex_unlock(channel->profile_mutex);