diff --git a/includes/views/handlers/views_ifempty_handler_field.inc b/includes/views/handlers/views_ifempty_handler_field.inc
old mode 100644
new mode 100755
index 026f2e4..7841ddb
--- a/includes/views/handlers/views_ifempty_handler_field.inc
+++ b/includes/views/handlers/views_ifempty_handler_field.inc
@@ -32,10 +32,14 @@ class views_ifempty_handler_field extends views_handler_field {
     // Scan all the fields and add them as options for our field selectors.
     $fields = array(
       0 => '- ' . t('no field selected') . ' -',
-    ) + $this->view->display_handler->get_field_labels();
-
-    // We only use fields up to (not including) this one.
-    unset($fields[$this->options['id']]);
+    );
+    foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
+      // We only use fields up to (not including) this one.
+      if ($field == $this->options['id']) {
+        break;
+      }
+      $fields[$field] = $handler->ui_name();
+    }
 
     $form['emptyfield'] = array(
       '#type' => 'select',
@@ -57,7 +61,7 @@ class views_ifempty_handler_field extends views_handler_field {
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) {
+  function options_validate(&$form, &$form_state) {
     $values = &$form_state['values']['options'];
     if (empty($values['emptyfield']) || empty($values['outputfield'])) {
       if (empty($values['emptyfield'])) {