diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
index 23ea0dfe3..025c97c6d 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
@@ -915,10 +915,8 @@ private Vector<MediaDescription> createMediaDescriptionsForAnswer(
                 answerDescriptions.add(SdpUtils
                                 .createDisablingAnswer(mediaDescription));
 
-                /*
-                 * TODO As we closeStream bellow when targetDataPort is equal to
-                 * 0, does it mean that we have to do it here?
-                 */
+                //close the stream in case it already exists
+                closeStream(mediaType);
                 continue;
             }
 
@@ -931,24 +929,12 @@ private Vector<MediaDescription> createMediaDescriptionsForAnswer(
                             .getDirectionForAnswer(remoteDirection);
 
             // create the corresponding stream...
-            if(targetDataPort != 0)
-            {
-                initStream(connector, dev, supportedFormats.get(0), target,
-                                direction);
-            }
-            else
-            // or destroy it in case the target port was 0.
-            {
-                /*
-                 * XXX We shouldn't even be here because targetDataPort has
-                 * already been checked.
-                 */
-                closeStream(mediaType);
-            }
+            initStream(connector, dev, supportedFormats.get(0), target,
+                      direction);
 
             // create the answer description
-            answerDescriptions.add(createMediaDescription(supportedFormats,
-                            connector, direction));
+            answerDescriptions.add(createMediaDescription(
+                            supportedFormats, connector, direction));
 
             atLeastOneValidDescription = true;
         }
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
index 9070bc840..5b8aa4af8 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
@@ -970,13 +970,12 @@ public static URL getCallInfoURL(SessionDescription sessDesc)
      * some other reason.
      */
     public static MediaDescription createMediaDescription(
-                    MediaDevice                dev,
+                    List<MediaFormat>          formats,
                     StreamConnector            connector,
                     MediaDirection             direction,
                     DynamicPayloadTypeRegistry dynamicPayloadTypes)
         throws OperationFailedException
     {
-        List<MediaFormat> formats = dev.getSupportedFormats();
         int[] payloadTypesArray = new int[formats.size()];
         Vector<Attribute> mediaAttributes = new Vector<Attribute>(
                         2 * payloadTypesArray.length + 1);