diff --git a/handlers/views_handler_area.inc b/handlers/views_handler_area.inc
index 9fed11c..00212fd 100644
--- a/handlers/views_handler_area.inc
+++ b/handlers/views_handler_area.inc
@@ -27,7 +27,7 @@ class views_handler_area extends views_handler {
    */
   function init(&$view, &$options) {
     parent::init($view, $options);
-    if ($this->handler_type == 'empty') {
+    if (isset($this->handler_type) && ($this->handler_type == 'empty')) {
       $this->options['empty'] = TRUE;
     }
   }
diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc
index 6be3dcc..2b3c945 100644
--- a/plugins/views_plugin_display.inc
+++ b/plugins/views_plugin_display.inc
@@ -2568,7 +2568,7 @@ class views_plugin_display extends views_plugin {
    * Render the header of the view.
    */
   function render_header() {
-    $empty = !empty($this->view->result);
+    $empty = empty($this->view->result);
     return $this->render_area('header', $empty);
   }
 
@@ -2576,12 +2576,12 @@ class views_plugin_display extends views_plugin {
    * Render the footer of the view.
    */
   function render_footer() {
-    $empty = !empty($this->view->result);
+    $empty = empty($this->view->result);
     return $this->render_area('footer', $empty);
   }
 
   function render_empty() {
-    return $this->render_area('empty');
+    return $this->render_area('empty', TRUE);
   }
 
   /**