Missing revision row causes an empty node object

The origin of this discovery is due to the following error when search started indexing our content

EntityMalformedException: Missing bundle property on entity of type node. in entity_extract_ids() (line 7407 of /drupal/path/includes/common.inc).

Debugging it, I found that the node object is empty even though checking the node table and fields, the ID is present except in the node_revision table. We did a migration and probably in the middle of it there was an error that skipped the revision table. (It was only a 1 node that had a missing revision row).

Looking into it more, it's because of the SQL query in the entity.inc

SELECT revision.vid AS vid, base.uid AS uid, revision.title AS title, revision.log AS log, revision.status AS status, revision.comment AS comment, revision.promote AS promote, revision.sticky AS sticky, base.nid AS nid, base.type AS type, base.language AS language, base.created AS created, base.changed AS changed, base.tnid AS tnid, base.translate AS translate, revision.timestamp AS revision_timestamp, revision.uid AS revision_uid
FROM 
{node} base
INNER JOIN {node_revision} revision ON revision.vid = base.vid

Since it's using inner join, even if the ID is present in the node table, it will still return an empty result.

My question, is there any way we can avoid an empty node object? Or avoid an empty revision?