diff --git a/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.js b/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.js
index f689d1fa6..bb8688f1f 100644
--- a/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.js
+++ b/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.js
@@ -1,10 +1,33 @@
-Template.studySeriesQuickSwitch.onCreated(function studySeriesQuickSwitchOnCreated() {
-    const instance = this;
-
-    var viewportIndex = instance.data.viewportIndex;
+Template.studySeriesQuickSwitch.onCreated(() => {
+    const instance = Template.instance();
 
     instance.data.timepointViewType = new ReactiveVar();
     instance.data.timepointViewType.set('key');
+
+    instance.getViewportData = viewportIndex => {
+        return layoutManager && layoutManager.viewportData && layoutManager.viewportData[viewportIndex];
+    };
+
+    instance.getCurrentStudy = () => {
+        const viewportIndex = instance.data.viewportIndex;
+        Session.get('CornerstoneNewImage' + viewportIndex);
+
+        layoutManager = window.layoutManager;
+        if (!layoutManager) {
+            return;
+        }
+
+        const viewportData = instance.getViewportData(viewportIndex);
+        if (!viewportData) {
+            return;
+        }
+
+        const study = ViewerStudies.findOne({
+            studyInstanceUid: viewportData.studyInstanceUid
+        });
+
+        return study;
+    };
 });
 
 Template.studySeriesQuickSwitch.helpers({
@@ -13,47 +36,26 @@ Template.studySeriesQuickSwitch.helpers({
     },
 
     currentStudy() {
-        var viewportIndex = Template.instance().data.viewportIndex;
-        Session.get('CornerstoneNewImage' + viewportIndex);
-
-        layoutManager = window.layoutManager;
-        if (!layoutManager) {
-            return;
-        }
-
-        var studyInstanceUid = layoutManager.viewportData[viewportIndex].studyInstanceUid;
-        var study = ViewerStudies.findOne({
-            studyInstanceUid: studyInstanceUid
-        });
-
-        return study;
+        return Template.instance().getCurrentStudy;
     },
 
     currentTimepoint() {
-        var viewportIndex = Template.instance().data.viewportIndex;
-        Session.get('CornerstoneNewImage' + viewportIndex);
+        const instance = Template.instance();
 
-        layoutManager = window.layoutManager;
-        if (!layoutManager) {
-            return;
-        }
+        const study = instance.getCurrentStudy();
 
-        var studyInstanceUid = layoutManager.viewportData[viewportIndex].studyInstanceUid;
-        var study = ViewerStudies.findOne({
-            studyInstanceUid: studyInstanceUid
-        });
-
-        var timepoint = Timepoint.findOne({
+        const timepoint = Timepoint.findOne({
             timepointId: study.timepointId
         });
+        console.warn('>>>>TIMEPOINT', timepoint);
 
         return timepoint;
     },
 
     thumbnails: function(study) {
-        var stacks = createStacks(study);
+        const stacks = createStacks(study);
 
-        var array = [];
+        const array = [];
         stacks.forEach(function(stack, index) {
             array.push({
                 thumbnailIndex: index,
diff --git a/Packages/viewerbase/lib/helpers/isSeriesActive.js b/Packages/viewerbase/lib/helpers/isSeriesActive.js
index 8e7fae1ec..2d88709ad 100644
--- a/Packages/viewerbase/lib/helpers/isSeriesActive.js
+++ b/Packages/viewerbase/lib/helpers/isSeriesActive.js
@@ -20,7 +20,7 @@ Template.registerHelper('isSeriesActive', (seriesInstanceUid, viewportIndex) =>
 
     let result = false;
     _.each(viewportData, data => {
-        if (data.seriesInstanceUid === seriesInstanceUid) {
+        if (data && data.seriesInstanceUid === seriesInstanceUid) {
             result = true;
         }
     });