diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7fab14448dd4672b9f310caf742eae20614b5f8a..fcc1ff8490814481e39c7a339db738c9e85dc9f1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ Calendar Module 7.x
 Version 7.x-3.x-dev
 ===================
 
+- Issue #1439832 by Dave Reid and HorsePunchKid, Undefined index error 'redirect' when using redirect module.
 - Switch to using entity_lable() and entity_uri() in row handler.
 - Issue #1284170 by benjifisher, Lots of cleanup of the iCal export and its template to be sure all day items are exported correctly.
 - Issue #1346424, The calendar title got left out of the latest ical template changes.
diff --git a/includes/calendar.views_template.inc b/includes/calendar.views_template.inc
index 62cfeb187bac2023fe63147ff7a295e35947c985..97855a1a509a2480b5f37ba09af0256e503beec8 100644
--- a/includes/calendar.views_template.inc
+++ b/includes/calendar.views_template.inc
@@ -24,6 +24,9 @@ function calendar_views_templates() {
   $processed = array();
 
   foreach ($entity_info as $entity_type => $info) {
+    if (!$info['fieldable']) {
+      continue;
+    }
     $items = field_info_instances($entity_type);
     $views_fields = date_views_fields($info['base table']);
     foreach ($views_fields['name'] as $name => $data) {