symfony
diff --git a/‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
+12Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
+12Lines changed: 12 additions & 0 deletions
@@ -289,7 +289,7 @@ public function getIndicesForChoices(array $models)
         $choices = $this->fixChoices($models);
         foreach ($this->getChoices() as $i => $choice) {
             foreach ($choices as $j => $givenChoice) {
-                if ($this->getIdentifierValues($choice) === $this->getIdentifierValues($givenChoice)) {
+                if (null !== $givenChoice && $this->getIdentifierValues($choice) === $this->getIdentifierValues($givenChoice)) {
                     $indices[] = $i;
                     unset($choices[$j]);
 
@@ -416,6 +416,10 @@ private function getIdentifierValues($model)
             return array($model->getPrimaryKey());
         }
 
+        if (null === $model) {
+            return array();
+        }
+
         return $model->getPrimaryKeys();
     }
 
 
@@ -199,4 +199,16 @@ public function testDifferentEqualObjectsAreChoosen()
 
         $this->assertEquals(array(1), $choiceList->getIndicesForChoices(array($choosenItem)));
     }
+
+    public function testGetIndicesForNullChoices()
+    {
+        $item = new Item(1, 'Foo');
+        $choiceList = new ModelChoiceList(
+            self::ITEM_CLASS,
+            'value',
+            array($item)
+        );
+
+        $this->assertEquals(array(), $choiceList->getIndicesForChoices(array(null)));
+    }
 }