diff --git a/includes/common.inc b/includes/common.inc
index 3a3d274..8d67560 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -7402,9 +7402,11 @@ function entity_extract_ids($entity_type, $entity) {
   if (!empty($info['entity keys']['bundle'])) {
     // Explicitly fail for malformed entities missing the bundle property.
     if (!isset($entity->{$info['entity keys']['bundle']}) || $entity->{$info['entity keys']['bundle']} === '') {
-      throw new EntityMalformedException(t('Missing bundle property on entity of type @entity_type.', array('@entity_type' => $entity_type)));
+      $bundle = $entity_type;
+    }
+    else {
+      $bundle = $entity->{$info['entity keys']['bundle']};
     }
-    $bundle = $entity->{$info['entity keys']['bundle']};
   }
   else {
     // The entity type provides no bundle key: assume a single bundle, named