diff --git a/includes/handlers.inc b/includes/handlers.inc
index b1ce1a31..1f2866f5 100644
--- a/includes/handlers.inc
+++ b/includes/handlers.inc
@@ -1543,7 +1543,7 @@ function build_join($select_query, $table, $view_query) {
     $arguments = array();
 
     // Tack on the extra.
-    if (isset($this->extra)) {
+    if (isset($this->extra) && is_array($this->extra)) {
       $extras = array();
       foreach ($this->extra as $info) {
         if (is_array($info)) {
@@ -1601,7 +1601,7 @@ function build_join($select_query, $table, $view_query) {
         }
       }
 
-      if ($extras) {
+      if (!empty($extras)) {
         if (count($extras) == 1) {
           $condition .= ' AND ' . array_shift($extras);
         }