diff --git a/OHIFViewer/client/components/viewer/viewer.html b/OHIFViewer/client/components/viewer/viewer.html
index 6e7b46e82..b9666139b 100644
--- a/OHIFViewer/client/components/viewer/viewer.html
+++ b/OHIFViewer/client/components/viewer/viewer.html
@@ -1,4 +1,5 @@
 <template name="viewer">
+    {{#if Template.subscriptionsReady}}
     <div id="viewer">
         {{> studyBrowser }}
         <div class='viewerMain'>
@@ -6,4 +7,7 @@
             {{ > imageViewerViewports }}
         </div>
     </div>
+    {{else}}
+        {{>loadingText}}
+    {{/if}}
 </template>
\ No newline at end of file
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index efde9a5c7..32ffb23c4 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -68,7 +68,8 @@ Template.viewer.onCreated(function() {
     Session.set('activeViewport', ViewerData[contentId].activeViewport || 0);
 
     // Update the ViewerStudies collection with the loaded studies
-    ViewerStudies = new Meteor.Collection(null);
+    ViewerStudies.remove({});
+    
     this.data.studies.forEach(function(study) {
         study.selected = true;
         ViewerStudies.insert(study);
diff --git a/Packages/worklist/lib/getStudyMetadata.js b/Packages/worklist/lib/getStudyMetadata.js
index 222bda47a..9b6f5a55a 100644
--- a/Packages/worklist/lib/getStudyMetadata.js
+++ b/Packages/worklist/lib/getStudyMetadata.js
@@ -24,16 +24,18 @@ getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
     // If no study metadata is in the cache variable, we need to retrieve it from
     // the server with a call.
     Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
-        var hipaaEvent = {
-            eventType: "viewed",
-            userId: Meteor.userId(),
-            userName: Meteor.user().profile.fullName,
-            collectionName: "Study",
-            recordId: studyInstanceUid,
-            patientId: study.patientId,
-            patientName: study.patientName
-        };
-        HipaaLogger.logEvent(hipaaEvent);
+        if (Meteor.user()) {
+            var hipaaEvent = {
+                eventType: "viewed",
+                userId: Meteor.userId(),
+                userName: Meteor.user().profile.fullName,
+                collectionName: "Study",
+                recordId: studyInstanceUid,
+                patientId: study.patientId,
+                patientName: study.patientName
+            };
+            HipaaLogger.logEvent(hipaaEvent);
+        }
 
         log.info('worklistStudy getStudyMetadata: ' + studyInstanceUid);