diff --git a/handlers/views_handler_field.inc b/handlers/views_handler_field.inc
index 5a5c4b7..07d1dfd 100644
--- a/handlers/views_handler_field.inc
+++ b/handlers/views_handler_field.inc
@@ -1014,6 +1014,10 @@ If you would like to have the characters \'[\' and \']\' please use the html ent
   function advanced_render($values) {
     if ($this->allow_advanced_render() && method_exists($this, 'render_item')) {
       $raw_items = $this->get_items($values);
+      // If there are no items, set the original value to NULL.
+      if (empty($raw_items)) {
+        $this->original_value = NULL;
+      }
     }
     else {
       $value = $this->render($values);
diff --git a/tests/field/views_fieldapi.test b/tests/field/views_fieldapi.test
index b8866c1..c5393b5 100644
--- a/tests/field/views_fieldapi.test
+++ b/tests/field/views_fieldapi.test
@@ -298,6 +298,8 @@ class viewsHandlerFieldFieldTest extends ViewsFieldApiTestHelper {
 
     // Setup a field with cardinality > 1.
     $this->fields[3] = $field = field_create_field(array('field_name' => 'field_name_3', 'type' => 'text', 'cardinality' => FIELD_CARDINALITY_UNLIMITED));
+    // Setup a field that will have no value.
+    $this->fields[4] = $field = field_create_field(array('field_name' => 'field_name_4', 'type' => 'text', 'cardinality' => FIELD_CARDINALITY_UNLIMITED));
 
     $this->setUpInstances();
 
@@ -315,6 +317,8 @@ class viewsHandlerFieldFieldTest extends ViewsFieldApiTestHelper {
       for ($j = 0; $j < 5; $j++) {
         $edit[$this->fields[3]['field_name']][LANGUAGE_NONE][$j]['value'] = $this->randomName(8);
       }
+      // Set this field to be empty.
+      $edit[$this->fields[4]['field_name']] = array();
 
       $this->nodes[$i] = $this->drupalCreateNode($edit);
     }
@@ -378,6 +382,10 @@ class viewsHandlerFieldFieldTest extends ViewsFieldApiTestHelper {
       }
       $this->assertEqual($rendered_field, implode(', ', $items), 'Take sure that the amount of items are limited.');
     }
+
+    // Test that an empty field is rendered without error.
+    $rendered_field = $view->style_plugin->get_field(4, $this->fields[4]['field_name']);
+
     $view->destroy();
 
     // Test delta limit + offset
