diff --git a/includes/datasource.inc b/includes/datasource.inc
index b0315ab..dbb391f 100755
--- a/includes/datasource.inc
+++ b/includes/datasource.inc
@@ -238,7 +238,7 @@ interface SearchApiDataSourceControllerInterface {
   public function getIndexStatus(SearchApiIndex $index);
 
   /**
-   * Get the entity_type if any of this data source
+   * Get the entity_type if any of this data source.
    *
    * @return string
    *   An entity type string or NULL.
@@ -336,7 +336,7 @@ abstract class SearchApiAbstractDataSourceController implements SearchApiDataSou
    * Get the entity_type if any of this data source
    *
    * @return string
-   *   An entity type string or ''.
+   *   An entity type string or NULL.
    */
   public function getEntityType() {
     return $this->entityType;
diff --git a/includes/index_entity.inc b/includes/index_entity.inc
index 644d22e..0d0e050 100644
--- a/includes/index_entity.inc
+++ b/includes/index_entity.inc
@@ -366,6 +366,16 @@ class SearchApiIndex extends Entity {
   }
 
   /**
+   * Get the entity_type if any of this index.
+   *
+   * @return string
+   *   An entity type string or NULL.
+   */
+  public function getEntityType() {
+    return $this->datasource()->getEntityType();
+  }
+
+  /**
    * Get the server this index lies on.
    *
    * @param $reset