diff --git a/content.module b/content.module
index d8c4a4d..bc96e28 100644
--- a/content.module
+++ b/content.module
@@ -1028,7 +1028,7 @@ function content_storage($op, $node) {
             }
             $db_info = content_database_info($field);
             foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $node->{$field_name}[0][$column];
+              $record[$attributes['column']] = isset($node->{$field_name}[0][$column]) ? $node->{$field_name}[0][$column] : NULL;
             }
           }
         }
@@ -1068,7 +1068,7 @@ function content_storage($op, $node) {
           foreach ($node->$field['field_name'] as $delta => $item) {
             $record = array();
             foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $item[$column];
+              $record[$attributes['column']] = isset($item[$column]) ? $item[$column] : NULL;
             }
             $record['nid'] = $node->nid;
             $record['vid'] = $node->vid;