diff --git a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/pl
index 2d1c5d7..041f5c5 100644
--- a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
+++ b/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
@@ -208,7 +208,14 @@ class EntityReference_SelectionHandler_Generic implements EntityReference_Select
    * Implements EntityReferenceHandler::validateAutocompleteInput().
    */
   public function validateAutocompleteInput($input, &$element, &$form_state, $form) {
-      $entities = $this->getReferencableEntities($input, '=', 6);
+      $entities = array();
+      if ($entities_by_bundle = $this->getReferencableEntities($input, '=', 6)) {
+        foreach ($entities_by_bundle as $bundle => $bundle_entities) {
+          // This will be a problem if entities share an id.
+          // Is that possible?  Can this return two types of entities?
+          $entities += $bundle_entities;
+        }
+      }
       if (empty($entities)) {
         // Error if there are no entities available for a required field.
         form_error($element, t('There are no entities matching "%value"', array('%value' => $input)));