diff --git a/geofield.install b/geofield.install
index 961160d..563db72 100644
--- a/geofield.install
+++ b/geofield.install
@@ -122,7 +122,7 @@ function geofield_update_7100() {
             ->execute()
             ->fetchAssoc();
           db_change_field($table_name, $column_name, $column_name, $srid_schema);
-          if (!empty($values)) {
+          if (!empty($values) && (count($values) > 0)) {
             // Put the values back as text
             foreach ($values as $value) {
               if ($value->{$column_name}) {