Index: main/features.c
===================================================================
--- main/features.c	(revision 313856)
+++ main/features.c	(working copy)
@@ -5733,7 +5733,6 @@
 	connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 	ast_channel_queue_connected_line_update(chan, &connected_caller, NULL);
 
-	ast_channel_unlock(cur);
 	ast_channel_unlock(chan);
 
 	if (ast_answer(chan)) {
@@ -5756,6 +5755,7 @@
 	ast_manager_event_multichan(EVENT_FLAG_CALL, "Pickup", 2, chans,
 		"Channel: %s\r\nTargetChannel: %s\r\n", chan->name, cur->name);
 
+	ast_channel_unlock(cur);
 	cur = ast_channel_unref(cur);
 
 	return res;