diff --git a/geocoder.widget.inc b/geocoder.widget.inc
index 63c8e95..a6dfe70 100644
--- a/geocoder.widget.inc
+++ b/geocoder.widget.inc
@@ -231,7 +231,7 @@ function geocoder_widget_get_field_value($entity_type, $field_instance, $entity
 
     // For entities being updated, determine if another geocode is necessary
     if ($entity) {
-      if (!empty($entity->original)) {
+      if (!empty($entity->original) && !empty($entity->original->$field_instance['field_name'])) {
         //@@TODO: Deal with entity-properties (non-fields)
         //@@TODO: This isn't working with file fields. Should use some kind of lookup / map
         $field_original = field_get_items($entity_type, $entity->original, $field_name, isset($entity->original->language) ? $entity->original->language : NULL);