diff --git semanticviews-view-fields.tpl.php semanticviews-view-fields.tpl.php
index 344fd6d..3eedf79 100644
--- semanticviews-view-fields.tpl.php
+++ semanticviews-view-fields.tpl.php
@@ -29,11 +29,11 @@
 ?>
 <?php foreach ($fields as $id => $field): ?>
 
-  <?php if ($field->element_type): ?>
+  <?php if (!empty($field->element_type)): ?>
     <<?php print $field->element_type; ?><?php print drupal_attributes($field->attributes); ?>>
   <?php endif; ?>
 
-    <?php if ($field->label): ?>
+    <?php if (!empty($field->label)): ?>
 
       <?php if ($field->label_element_type): ?>
         <<?php print $field->label_element_type; ?><?php print drupal_attributes($field->label_attributes); ?>>
@@ -49,7 +49,7 @@
 
       <?php print $field->content; ?>
 
-  <?php if ($field->element_type): ?>
+  <?php if (!empty($field->element_type)): ?>
     </<?php print $field->element_type; ?>>
   <?php endif; ?>
 
diff --git semanticviews.theme.inc semanticviews.theme.inc
index 08e738d..f4a9e71 100644
--- semanticviews.theme.inc
+++ semanticviews.theme.inc
@@ -30,25 +30,27 @@ function template_preprocess_semanticviews_view_fields(&$vars) {
 
       $object->handler = &$view->field[$id];
 
-      if (isset($vars['options']['semantic_html'][$id])) $semantic_html = $vars['options']['semantic_html'][$id];
-
-      // Field content
-      $object->element_type = check_plain($semantic_html['element_type']);
-      $object->attributes = array();
-      if ($semantic_html['class']) {
-        $object->attributes['class'] = $semantic_html['class'];
-      }
+      if (isset($vars['options']['semantic_html'][$id]))
+      {
+        $semantic_html = $vars['options']['semantic_html'][$id];
+
+        // Field content
+        $object->element_type = check_plain($semantic_html['element_type']);
+        $object->attributes = array();
+        if ($semantic_html['class']) {
+          $object->attributes['class'] = $semantic_html['class'];
+        }
 
-      // Field label
-      $object->label = check_plain($view->field[$id]->label());
-      if (!empty($object->label)) {
-        $object->label_element_type = check_plain($semantic_html['label_element_type']);
-        $object->label_attributes = array();
-        if ($semantic_html['label_class']) {
-          $object->label_attributes['class'] = $semantic_html['label_class'];
+        // Field label
+        $object->label = check_plain($view->field[$id]->label());
+        if (!empty($object->label)) {
+          $object->label_element_type = check_plain($semantic_html['label_element_type']);
+          $object->label_attributes = array();
+          if ($semantic_html['label_class']) {
+            $object->label_attributes['class'] = $semantic_html['label_class'];
+          }
         }
       }
-
       $vars['fields'][$id] = $object;
     }
   }