diff --git a/d6/d6.inc b/d6/d6.inc
index 49eb42c..ff001a1 100644
--- a/d6/d6.inc
+++ b/d6/d6.inc
@@ -217,8 +217,10 @@ class DrupalVersion6 extends DrupalVersion {
           // the field name, not the column name (e.g., field_foo rather
           // than field_foo_value).
           $fix_field_names = array();
+          $found_field = FALSE;
           foreach ($this->sourceFieldInfo as $field_name => $info) {
             if (isset($info['columns']) && !$info['multiple'] && $info['db_storage']) {
+              $found_field = TRUE;
               $i = 0;
               foreach ($info['columns'] as $display_name => $column_name) {
                 if ($i++ == 0) {
@@ -235,13 +237,16 @@ class DrupalVersion6 extends DrupalVersion {
               }
             }
           }
-          $data_row = $query->execute()->fetchObject();
-          if (is_object($data_row)) {
-            foreach ($data_row as $name => $value) {
-              if (isset($fix_field_names[$name])) {
-                $name = $fix_field_names[$name];
+          // Only execute, if we found a field we can handle.
+          if ($found_field) {
+            $data_row = $query->execute()->fetchObject();
+            if (is_object($data_row)) {
+              foreach ($data_row as $name => $value) {
+                if (isset($fix_field_names[$name])) {
+                  $name = $fix_field_names[$name];
+                }
+                $row->$name = $value;
               }
-              $row->$name = $value;
             }
           }
         }