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 7949eb81e..8acb2904e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
@@ -859,18 +859,18 @@ private MediaStream initStream(StreamConnector      connector,
             else
                 stream = mediaService.createMediaStream(
                                             connector, device, control);
-
-            /* set negociated output size for video stream */
-            if(device.getMediaType() == MediaType.VIDEO)
-            {
-                ((VideoMediaStream)stream).setOutputSize(size);
-            }
         }
         else
         {
             //this is a reinit
         }
 
+        /* set negociated output size for video stream */
+        if(device != null && device.getMediaType() == MediaType.VIDEO)
+        {
+            ((VideoMediaStream)stream).setOutputSize(size);
+        }
+
         return  configureAndStartStream(
                         device, format, target, direction, stream);
     }