diff --git a/linphone/coreapi/exevents.c b/linphone/coreapi/exevents.c
index c1ff8848c..5de760e7b 100644
--- a/linphone/coreapi/exevents.c
+++ b/linphone/coreapi/exevents.c
@@ -638,6 +638,7 @@ int linphone_accept_audio_offer(sdp_context_t *ctx,sdp_payload_t *payload)
 		return -1;
 	}
 	if (lc->sip_conf.only_one_codec && params->initialized){
+		ms_message("Only one codec has to be accepted.");
 		return -1;
 	}
 	if (supported==SupportedAndValid) {		
@@ -665,7 +666,11 @@ int linphone_accept_audio_offer(sdp_context_t *ctx,sdp_payload_t *payload)
 			payload->b_as_bandwidth=(lc->dw_audio_bw>0) ? lc->dw_audio_bw : 0;
 		}else{
 			/* refuse all other audio lines*/
-			if(params->line!=payload->line) return -1;
+			if(params->line!=payload->line) {
+				ms_message("Only one audio line can be accepted.");
+				abort();
+				return -1;
+			}
 		}
 	}
 	return 0;
diff --git a/linphone/coreapi/sdphandler.c b/linphone/coreapi/sdphandler.c
index abded94c8..4c0337c3e 100644
--- a/linphone/coreapi/sdphandler.c
+++ b/linphone/coreapi/sdphandler.c
@@ -377,7 +377,7 @@ sdp_context_get_answer ( sdp_context_t *ctx,sdp_message_t *remote)
 					/* ask the application if this codec is supported */
 					err = sdph->accept_audio_codecs (ctx,
 									 &payload);
-					if (err == 0 && payload.localport > 0)
+					if (err == 0)
 					{
 						ncodec++;
 						/* codec accepted */
@@ -485,7 +485,7 @@ sdp_context_get_answer ( sdp_context_t *ctx,sdp_message_t *remote)
 					/* ask the application if this codec is supported */
 					err = sdph->accept_video_codecs (ctx,
 									 &payload);
-					if (err == 0 && payload.localport > 0)
+					if (err == 0 )
 					{
 						ncodec++;
 						/* codec accepted */
diff --git a/linphone/po/POTFILES.in b/linphone/po/POTFILES.in
index 7b4feed9e..b1e20e758 100644
--- a/linphone/po/POTFILES.in
+++ b/linphone/po/POTFILES.in
@@ -22,4 +22,38 @@ coreapi/misc.c
 coreapi/exevents.c
 coreapi/presence.c
 coreapi/friends.c
+mediastreamer2/src/alaw.c
+mediastreamer2/src/alsa.c
+mediastreamer2/src/aqsnd.c
+mediastreamer2/src/dtmfgen.c
+mediastreamer2/src/gsm.c
+mediastreamer2/src/macsnd.c
+mediastreamer2/src/msconf.c
+mediastreamer2/src/msfileplayer.c
+mediastreamer2/src/msfilerec.c
+mediastreamer2/src/msfilerec_win.c
+mediastreamer2/src/msjoin.c
+mediastreamer2/src/msresample.c
+mediastreamer2/src/msrtp.c
+mediastreamer2/src/msspeex.c
+mediastreamer2/src/msvolume.c
+mediastreamer2/src/msv4l.c
+mediastreamer2/src/msv4l2.c
+mediastreamer2/src/msv4m.c
+mediastreamer2/src/nowebcam.c
+mediastreamer2/src/oss.c
+mediastreamer2/src/pixconv.c
+mediastreamer2/src/sdlout.c
+mediastreamer2/src/sizeconv.c
+mediastreamer2/src/speexec.c
+mediastreamer2/src/tee.c
+mediastreamer2/src/theora.c
+mediastreamer2/src/ulaw.c
+mediastreamer2/src/videodec.c
+mediastreamer2/src/videoenc.c
+mediastreamer2/src/videoout.c
+mediastreamer2/src/wincevideods.c
+mediastreamer2/src/winvideo.c
+mediastreamer2/src/winvideods.c
+mediastreamer2/src/winvideo2.c