diff --git a/d6/d6.inc b/d6/d6.inc
index 38c7301..3fd6c80 100644
--- a/d6/d6.inc
+++ b/d6/d6.inc
@@ -105,11 +105,11 @@ class DrupalVersion6 extends DrupalVersion {
                          ->fetchObject();
         // To hopefully uniquify the machine names, use the content_profile
         // node type in the name.
-        if ($type_info->has_title) {
+        if (!empty($type_info->has_title)) {
           $this->sourceFieldInfo['field_' . $bundle . '_title'] =
             array('label' => $type_info->title_label, 'type' => 'title');
         }
-        if ($type_info->has_body) {
+        if (!empty($type_info->has_body)) {
           $this->sourceFieldInfo['field_' . $bundle . '_body'] =
             array('label' => $type_info->body_label, 'type' => 'body');
         }
@@ -390,23 +390,23 @@ class DrupalVersion6 extends DrupalVersion {
       foreach ($result as $term_row) {
         $row->{$term_row->vid}[] = $term_row->tid;
       }
-    }
 
-    if (Database::getConnection('default',
-                                $this->arguments['source_connection'])
-          ->schema()->tableExists('upload')) {
-      $result =
-        Database::getConnection('default', $this->arguments['source_connection'])
-                   ->select('upload', 'u')
-                   ->fields('u', array('fid', 'description', 'list', 'weight'))
-                   ->condition('vid', $revision_id)
-                   ->orderBy('weight')
-                   ->execute();
-      foreach ($result as $upload_row) {
-        $row->upload[] = $upload_row->fid;
-        $row->{'upload:description'}[] = $upload_row->description;
-        $row->{'upload:list'}[] = $upload_row->list;
-        $row->{'upload:weight'}[] = $upload_row->weight;
+      if (Database::getConnection('default',
+                                  $this->arguments['source_connection'])
+            ->schema()->tableExists('upload')) {
+        $result =
+          Database::getConnection('default', $this->arguments['source_connection'])
+                     ->select('upload', 'u')
+                     ->fields('u', array('fid', 'description', 'list', 'weight'))
+                     ->condition('vid', $revision_id)
+                     ->orderBy('weight')
+                     ->execute();
+        foreach ($result as $upload_row) {
+          $row->upload[] = $upload_row->fid;
+          $row->{'upload:description'}[] = $upload_row->description;
+          $row->{'upload:list'}[] = $upload_row->list;
+          $row->{'upload:weight'}[] = $upload_row->weight;
+        }
       }
     }
   }