diff --git a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.js b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.js
index 7a095bfa7..ccb05fc5f 100644
--- a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.js
+++ b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.js
@@ -65,9 +65,9 @@ Template.studyTimepointStudy.events({
 
             if (!alreadyLoaded) {
                 $study.addClass('loading');
-                getStudyMetadata(studyInstanceUid, studyData => {
+                getStudyMetadata(studyInstanceUid, study => {
                     study.displaySets = createStacks(study);
-                    ViewerStudies.insert(studyData);
+                    ViewerStudies.insert(study);
                     instance.select(isQuickSwitch);
                 });
             } else {
diff --git a/Packages/viewerbase/lib/helpers/studyThumbnails.js b/Packages/viewerbase/lib/helpers/studyThumbnails.js
index ad7a97ac6..5c2a4693f 100644
--- a/Packages/viewerbase/lib/helpers/studyThumbnails.js
+++ b/Packages/viewerbase/lib/helpers/studyThumbnails.js
@@ -2,6 +2,10 @@
  * A global Blaze UI helper to get the thumbnails for the given study
  */
 Template.registerHelper('studyThumbnails', study => {
+    if (!study) {
+        return;
+    }
+
     // Find the study's stacks
     const stacks = study.displaySets;