diff --git a/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js b/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js
index f1a297fe0..dd15fd190 100644
--- a/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js
+++ b/Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js
@@ -27,6 +27,7 @@ export class MetadataProvider {
         const metadata = {};
 
         metadata.study = {
+            accessionNumber: studyMetadata.accessionNumber,
             patientId: studyMetadata.patientId,
             studyInstanceUid: studyMetadata.studyInstanceUid,
             studyDate: studyMetadata.studyDate,
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
index 81726a683..7bb30daaf 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
@@ -28,7 +28,7 @@ Template.measurementTableView.helpers({
         const instance = Template.instance();
         const groups = instance.data.measurementGroups.get();
         const group = _.find(groups, item => item.toolGroup.id === toolGroupId);
-        return !!group.measurementRows.length;
+        return group && !!group.measurementRows.length;
     },
 
     getNewToolGroup(tool) {
@@ -58,9 +58,7 @@ Template.measurementTableView.helpers({
         const current = instance.data.timepointApi.current();
         const baseline = timepointApi.baseline();
 
-        if (!measurementApi || !timepointApi || !current) {
-            return;
-        }
+        if (!measurementApi || !timepointApi || !current || !baseline) return;
 
         // If this is a baseline, stop here since there are no new measurements to display