symfony
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
-1Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
-1Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -1372,7 +1372,6 @@ public function testSubmitMultipleChoicesInts()
         $form = $this->factory->create(static::TESTED_TYPE, null, array(
             'multiple' => true,
             'choices' => array_flip($this->numericChoicesFlipped),
-            'choices_as_values' => true,
         ));
 
         $form->submit(array(1, 2));
 
@@ -67,7 +67,7 @@ public static function castThrowingCasterException(ThrowingCasterException $e, a
         $prefix = Caster::PREFIX_PROTECTED;
         $xPrefix = "\0Exception\0";
 
-        if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) {
+        if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace']) && $a[$xPrefix.'previous'] instanceof \Exception) {
             $b = (array) $a[$xPrefix.'previous'];
             self::traceUnshift($b[$xPrefix.'trace'], get_class($a[$xPrefix.'previous']), $b[$prefix.'file'], $b[$prefix.'line']);
             $a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -count($a[$xPrefix.'trace']->value));