diff --git a/views-calc-table.tpl.php b/views-calc-table.tpl.php
index 6d3618e..1a59b4e 100644
--- a/views-calc-table.tpl.php
+++ b/views-calc-table.tpl.php
@@ -23,9 +23,11 @@ if (empty($rows) && empty($totals)) {
   <thead>
     <tr>
       <?php foreach ($header as $field => $label): ?>
-        <th class="views-field views-field-<?php print $fields[$field]; ?> <?php print $options['info'][$field]['align'] ?>">
-          <?php print $label; ?>
-        </th>
+        <?php if (isset($fields[$field]) && isset($options['info'][$field]['align'])): ?>
+          <th class="views-field views-field-<?php print $fields[$field]; ?> <?php print $options['info'][$field]['align'] ?>">
+            <?php print $label; ?>
+          </th>
+        <?php endif; ?>
       <?php endforeach; ?>
     </tr>
   </thead>
@@ -33,9 +35,11 @@ if (empty($rows) && empty($totals)) {
     <?php foreach ($rows as $count => $row): ?>
       <tr class="<?php print ($count % 2 == 0) ? 'even' : 'odd';?>">
         <?php foreach ($row as $field => $content): ?>
-          <td class="views-field views-field-<?php print $fields[$field]; ?>  <?php print $options['info'][$field]['align'] ?>">
-            <?php print $content; ?>
-          </td>
+          <?php if (isset($fields[$field]) && isset($options['info'][$field]['align'])): ?>
+            <td class="views-field views-field-<?php print $fields[$field]; ?>  <?php print $options['info'][$field]['align'] ?>">
+              <?php print $content; ?>
+            </td>
+          <?php endif; ?>
         <?php endforeach; ?>
       </tr>
     <?php endforeach; ?>
@@ -44,18 +48,22 @@ if (empty($rows) && empty($totals)) {
     <?php foreach ($sub_totals as $type => $row): ?>
       <tr class="view-subfooter-number">
         <?php foreach ($row as $field => $content): ?>
-          <td class="view-subfooter views-field views-field-<?php print $fields[$field]; ?>  <?php print $options['info'][$field]['align'] ?>">
-            <?php print $content; ?>
-          </td>
+          <?php if (isset($fields[$field]) && isset($options['info'][$field]['align'])): ?>
+            <td class="view-subfooter views-field views-field-<?php print $fields[$field]; ?>  <?php print $options['info'][$field]['align'] ?>">
+              <?php print $content; ?>
+            </td>
+          <?php endif; ?>
         <?php endforeach; ?>
       </tr>
     <?php endforeach; ?>
     <?php foreach ($totals as $type => $row): ?>
       <tr class="view-footer-number">
         <?php foreach ($row as $field => $content): ?>
-          <td class="view-footer views-field views-field-<?php print $fields[$field]; ?>  <?php print $options['info'][$field]['align'] ?>">
-            <?php print $content; ?>
-          </td>
+          <?php if (isset($fields[$field]) && isset($options['info'][$field]['align'])): ?>
+            <td class="view-footer views-field views-field-<?php print $fields[$field]; ?>  <?php print $options['info'][$field]['align'] ?>">
+              <?php print $content; ?>
+            </td>
+          <?php endif; ?>
         <?php endforeach; ?>
       </tr>
     <?php endforeach; ?>
diff --git a/views_calc_table.inc b/views_calc_table.inc
index 7e17548..5b4a0b6 100644
--- a/views_calc_table.inc
+++ b/views_calc_table.inc
@@ -277,7 +277,7 @@ class views_calc_table extends views_plugin_style_table {
     $calc_fields = array();
     foreach ($columns as $field => $column) {
       if ($field == $column && empty($fields[$field]->options['exclude'])) {
-        if ($options['info'][$field]['has_calc']) {
+        if (isset($options['info'][$field]['has_calc']) && $options['info'][$field]['has_calc']) {
           foreach ($calcs as $calc) {
             if (isset($this->options['info'][$field]['calc'][$calc])) {
               $calc_fields[$calc][] = $field;