diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index a738062423404a79fef6b5700ec3fb1c0350c8ca..89c2baa7c0329acd319411245205c2ec19dd9951 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -55,7 +55,7 @@ protected function setUp() {
         $edit[$this->fields[3]['field_name']][LANGUAGE_NOT_SPECIFIED][$j]['value'] = $this->randomName(8);
       }
       // Set this field to be empty.
-      $edit[$this->fields[4]['field_name']] = array();
+      $edit[$this->fields[4]['field_name']] = array(LANGUAGE_NOT_SPECIFIED => array(0 => array('value' => NULL)));
 
       $this->nodes[$i] = $this->drupalCreateNode($edit);
     }
diff --git a/views.module b/views.module
index 8f5b877ecf0ec722e53536d2c3ad5446cc52dbc0..1b3ec2e2a463fd4fdd42d998ce501e503921ed47 100644
--- a/views.module
+++ b/views.module
@@ -2249,7 +2249,7 @@ function _field_view_formatter_options($field_type = NULL) {
     $field_types = field_info_field_types();
     $options = array();
     foreach (field_info_formatter_types() as $name => $formatter) {
-      foreach ($formatter['field types'] as $formatter_field_type) {
+      foreach ($formatter['field_types'] as $formatter_field_type) {
         // Check that the field type exists.
         if (isset($field_types[$formatter_field_type])) {
           $options[$formatter_field_type][$name] = $formatter['label'];