From 3065f16e42a16f05c7377f3926a2533878b0c7dc Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Fri, 6 Jan 2017 07:46:24 -0200
Subject: [PATCH] LT-115: Fixing issue with location for not found baseline

---
 .../ohif-measurements/both/configuration/measurements.js     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Packages/ohif-measurements/both/configuration/measurements.js b/Packages/ohif-measurements/both/configuration/measurements.js
index dee5f6735..bd60196d9 100644
--- a/Packages/ohif-measurements/both/configuration/measurements.js
+++ b/Packages/ohif-measurements/both/configuration/measurements.js
@@ -53,7 +53,10 @@ class MeasurementApi {
                     });
                     if (baselineGroupEntry) {
                         const tool = this.tools[baselineGroupEntry.toolId];
-                        location = tool.findOne({ measurementNumber }).location;
+                        const found = tool.findOne({ measurementNumber });
+                        if (found) {
+                            location = found.location;
+                        }
                     }
 
                     // Reflect the entry in the tool group collection