X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.charts%2Fsrc%2Forg%2Fsimantics%2Fcharts%2FCharts.java;h=8ca1ca1eafef43c9b469d6c1dcfbf40f0f7eac8f;hb=ca89ffe386060acd0915580c60b2ab6fde36a5db;hp=1358c402333b40a42d425e66acaef6faf339af42;hpb=a5e69e900dcfcf54a9f39ab754f20467d99b64d3;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java b/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
index 1358c4023..8ca1ca1ea 100644
--- a/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
+++ b/bundles/org.simantics.charts/src/org/simantics/charts/Charts.java
@@ -48,9 +48,13 @@ public final class Charts {
     public static HistorySamplerItem createHistorySamplerItem(ReadGraph graph, Resource subscriptionItem, ChartData data) throws DatabaseException {
 
         try {
-            Resource model = graph.syncRequest(new PossibleIndexRoot(subscriptionItem));
-            if (model == null) {
-                throw new DatabaseException("There is no model for " + subscriptionItem);
+            Resource indexRoot = graph.syncRequest(new PossibleIndexRoot(subscriptionItem));
+            if (indexRoot == null) {
+                throw new DatabaseException("There is no index root for " + subscriptionItem);
+            }
+
+            if(data == null) {
+                throw new DatabaseException("There is no chart data for " + subscriptionItem);
             }
 
             ItemManager im = new ItemManager(data.history.getItems());