diff --git a/2549435-5.patch b/2549435-5.patch
new file mode 100644
index 0000000..4383ff1
--- /dev/null
+++ b/2549435-5.patch
@@ -0,0 +1,71 @@
+diff --git a/views_timelinejs_plugin_style_timelinejs.inc b/views_timelinejs_plugin_style_timelinejs.inc
+index 2c94092..4a4577b 100644
+--- a/views_timelinejs_plugin_style_timelinejs.inc
++++ b/views_timelinejs_plugin_style_timelinejs.inc
+@@ -253,7 +253,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+       '#default_value' => $this->options['timeline_config']['gmap_key'],
+       '#states' => array(
+         'invisible' => array(
+-          'select[name="style_options[timeline_config][maptype]"]' => array('value' => '0'),
++          'select[name="style_plugin->options[timeline_config][maptype]"]' => array('value' => '0'),
+         ),
+       ),
+     );
+@@ -432,8 +432,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+ 
+       // Render fields to trigger rewriting and other field processing.
+       $this->view->style_plugin->render_fields($this->view->result);
+-
+-      if ($this->view->style_options['timeline_config']['start_at_current']) {
++      if ($this->view->style_plugin->options['timeline_config']['start_at_current']) {
+         // Gives you a timestamp of the date
+         $date_check = strtotime('now');
+         // Holds the difference of the closest date
+@@ -461,13 +460,13 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+ 
+           // Headline - can use any view field, uses views rendering.
+           if ($target_field == 'headline') {
+-            $headline_field = $this->view->style_options['timeline_fields']['headline'];
++            $headline_field = $this->view->style_plugin->options['timeline_fields']['headline'];
+             $rows[$count][$target_field] = $this->rendered_fields[$count][$headline_field];
+           }
+ 
+           // Body - can use any view field, uses views rendering.
+           if ($target_field == 'text') {
+-            $body_field = $this->view->style_options['timeline_fields']['bodytext'];
++            $body_field = $this->view->style_plugin->options['timeline_fields']['bodytext'];
+             $rows[$count][$target_field] = $this->rendered_fields[$count][$body_field];
+           }
+ 
+@@ -514,7 +513,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+               if (is_array($date['formatted'])) {
+                 if ($target_field == 'startDate') {
+                   if ($date['formatted']['value'] != "FALSE") {
+-                    if ($this->view->style_options['timeline_config']['start_at_current']) {
++                    if ($this->view->style_plugin->options['timeline_config']['start_at_current']) {
+                       // abs to get the absolute difference
+                       $diff = abs($date['timestamp']['value'] - $date_check);
+ 
+@@ -610,7 +609,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+           'date' => $rows,
+         ),
+       );
+-      if ($this->view->style_options['timeline_config']['start_at_current']) {
++      if ($this->view->style_plugin->options['timeline_config']['start_at_current']) {
+         $data['timeline']['start_at_current'] = $start_at_current;
+       }
+     }
+@@ -661,11 +660,10 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+    */
+   protected function getDefinedUsage($type) {
+     // If it's not mapped at all, don't do anything.
+-    if (!isset($this->view->style_options['timeline_fields'])) {
++    if (!isset($this->view->style_plugin->options['timeline_fields'])) {
+       return FALSE;
+     }
+-
+-    if ($fields = $this->view->style_options['timeline_fields']) {
++    if ($fields = $this->view->style_plugin->options['timeline_fields']) {
+       $fieldname = '';
+       if (isset($fields[$type])) {
+         $fieldname = $fields[$type];
diff --git a/2549435-6.patch b/2549435-6.patch
new file mode 100644
index 0000000..ed7ec57
--- /dev/null
+++ b/2549435-6.patch
@@ -0,0 +1,64 @@
+diff --git a/views_timelinejs_plugin_style_timelinejs.inc b/views_timelinejs_plugin_style_timelinejs.inc
+index 2c94092..f230b34 100644
+--- a/views_timelinejs_plugin_style_timelinejs.inc
++++ b/views_timelinejs_plugin_style_timelinejs.inc
+@@ -431,9 +431,9 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+       $rows = array();
+ 
+       // Render fields to trigger rewriting and other field processing.
+-      $this->view->style_plugin->render_fields($this->view->result);
++      $this->render_fields($this->view->result);
+ 
+-      if ($this->view->style_options['timeline_config']['start_at_current']) {
++      if ($this->options['timeline_config']['start_at_current']) {
+         // Gives you a timestamp of the date
+         $date_check = strtotime('now');
+         // Holds the difference of the closest date
+@@ -461,13 +461,13 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+ 
+           // Headline - can use any view field, uses views rendering.
+           if ($target_field == 'headline') {
+-            $headline_field = $this->view->style_options['timeline_fields']['headline'];
++            $headline_field = $this->options['timeline_fields']['headline'];
+             $rows[$count][$target_field] = $this->rendered_fields[$count][$headline_field];
+           }
+ 
+           // Body - can use any view field, uses views rendering.
+           if ($target_field == 'text') {
+-            $body_field = $this->view->style_options['timeline_fields']['bodytext'];
++            $body_field = $this->options['timeline_fields']['bodytext'];
+             $rows[$count][$target_field] = $this->rendered_fields[$count][$body_field];
+           }
+ 
+@@ -514,7 +514,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+               if (is_array($date['formatted'])) {
+                 if ($target_field == 'startDate') {
+                   if ($date['formatted']['value'] != "FALSE") {
+-                    if ($this->view->style_options['timeline_config']['start_at_current']) {
++                    if ($this->options['timeline_config']['start_at_current']) {
+                       // abs to get the absolute difference
+                       $diff = abs($date['timestamp']['value'] - $date_check);
+ 
+@@ -610,7 +610,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+           'date' => $rows,
+         ),
+       );
+-      if ($this->view->style_options['timeline_config']['start_at_current']) {
++      if ($this->options['timeline_config']['start_at_current']) {
+         $data['timeline']['start_at_current'] = $start_at_current;
+       }
+     }
+@@ -661,11 +661,10 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
+    */
+   protected function getDefinedUsage($type) {
+     // If it's not mapped at all, don't do anything.
+-    if (!isset($this->view->style_options['timeline_fields'])) {
++    if (!isset($this->options['timeline_fields'])) {
+       return FALSE;
+     }
+-
+-    if ($fields = $this->view->style_options['timeline_fields']) {
++    if ($fields = $this->options['timeline_fields']) {
+       $fieldname = '';
+       if (isset($fields[$type])) {
+         $fieldname = $fields[$type];
diff --git a/views_timelinejs_plugin_style_timelinejs.inc b/views_timelinejs_plugin_style_timelinejs.inc
index f230b34..52c7bbd 100644
--- a/views_timelinejs_plugin_style_timelinejs.inc
+++ b/views_timelinejs_plugin_style_timelinejs.inc
@@ -433,7 +433,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
       // Render fields to trigger rewriting and other field processing.
       $this->render_fields($this->view->result);
 
-      if ($this->options['timeline_config']['start_at_current']) {
+      if (!empty($this->options['timeline_config']['start_at_current'])) {
         // Gives you a timestamp of the date
         $date_check = strtotime('now');
         // Holds the difference of the closest date
@@ -514,7 +514,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
               if (is_array($date['formatted'])) {
                 if ($target_field == 'startDate') {
                   if ($date['formatted']['value'] != "FALSE") {
-                    if ($this->options['timeline_config']['start_at_current']) {
+                    if (!empty($this->options['timeline_config']['start_at_current'])) {
                       // abs to get the absolute difference
                       $diff = abs($date['timestamp']['value'] - $date_check);
 
@@ -610,7 +610,7 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
           'date' => $rows,
         ),
       );
-      if ($this->options['timeline_config']['start_at_current']) {
+      if (!empty($this->options['timeline_config']['start_at_current'])) {
         $data['timeline']['start_at_current'] = $start_at_current;
       }
     }
@@ -674,8 +674,8 @@ class views_timelinejs_plugin_style_timelinejs extends views_plugin_style {
       }
       if (isset($fieldname) && $fieldname != '0') {
         $field_information = array(
-          'alias' => $this->view->field[$fieldname]->field_alias,
-          'handler' => $this->view->field[$fieldname]->definition['handler'],
+          'alias' => isset($this->view->field[$fieldname]) ? $this->view->field[$fieldname]->field_alias : NULL,
+          'handler' => isset($this->view->field[$fieldname]) ? $this->view->field[$fieldname]->definition['handler'] : NULL,
           'fieldname' => $fieldname,
         );
       }