diff --git a/common b/common
index 888e0a2..2004d03 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 888e0a268b60904dd208b672a3c57f1ff7d9786c
+Subproject commit 2004d03037bbb2bb72de7a49ba501a7b5f6e2f92
diff --git a/pitivi/stream.py b/pitivi/stream.py
index bedf454..adfcb22 100644
--- a/pitivi/stream.py
+++ b/pitivi/stream.py
@@ -370,9 +370,10 @@ def get_stream_for_pad(pad, store_pad=False):
         caps = pad.get_caps()
     pad_id = get_pad_id(pad)
     stream = get_stream_for_caps(caps, pad)
-    stream.pad_id = pad_id
-    if store_pad:
-        stream.pad = pad
+    if stream:
+        stream.pad_id = pad_id
+        if store_pad:
+            stream.pad = pad
 
     return stream
 
