Cannot delete content that doesn't have body field

Fatal error on like 325 in field.attach.inc

Current

      if (isset($wrapper->field_deleted_summary)) {
        $body_value = field_view_field($context['entity_type'], $context['entity'], 'body', array(

Proposed

      if (isset($wrapper->field_deleted_summary) && field_info_instance($context['entity_type'], $context['entity'], 'body')) {

Or want to do something else in case of no body field?