Index: main/autoservice.c
===================================================================
--- main/autoservice.c	(revision 411779)
+++ main/autoservice.c	(working copy)
@@ -172,11 +172,11 @@
 		} else if (f) {
 			ast_frfree(f);
 		}
-	}
 
-	if (callid) {
-		ast_callid_threadassoc_remove();
-		callid = ast_callid_unref(callid);
+		if (callid) {
+			ast_callid_threadassoc_remove();
+			callid = ast_callid_unref(callid);
+		}
 	}
 
 	asthread = AST_PTHREADT_NULL;