diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
index e99c835879..a72339e124 100644
--- a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -47,7 +47,7 @@ class HttpFoundationExtension extends AbstractExtension
         $requestContext = null;
         if (2 === \func_num_args()) {
             $requestContext = \func_get_arg(1);
-            if (!$requestContext instanceof RequestContext) {
+            if (null !== $requestContext && !$requestContext instanceof RequestContext) {
                 throw new \TypeError(sprintf('The second argument must be an instance of "%s".', RequestContext::class));
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
index 4889c8e7cb..2c777a16fa 100644
--- a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
+++ b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
@@ -53,6 +53,10 @@ final class BoundArgument implements ArgumentInterface
      */
     public function setValues(array $values)
     {
-        list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;
+        if (5 === count($values)) {
+            list($this->value, $this->identifier, $this->used, $this->type, $this->file) = $values;
+        } else {
+            list($this->value, $this->identifier, $this->used) = $values;
+        }
     }
 }