Parse@ tensor value expressions

2 files changed, 2 insertions, 2 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index 30f7185959c..3812dd26370 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -110,7 +110,7 @@ public abstract class TensorAddress implements Comparable<TensorAddress> {
                 return Long.parseLong(labels[i]);
             }
             catch (NumberFormatException e) {
-                throw new IllegalArgumentException("Expected a long label in " + this + " at position " + i);
+                throw new IllegalArgumentException("Expected an integer label in " + this + " at position " + i + " but got '" + labels[i] + "'");
             }
         }
 
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java
index 3113d48335a..0a881c0a290 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java
@@ -82,7 +82,7 @@ public class Value extends PrimitiveTensorFunction {
             if (cellAddress.get(0).index().isPresent())
                 return "[" + cellAddress.get(0).index().get() + "]";
             else
-                return "{" + cellAddress.get(0).index().get() + "}";
+                return "{" + cellAddress.get(0).label() + "}";
         }
         else {
             return "{" + cellAddress.stream().map(i -> i.toString()).collect(Collectors.joining(", ")) + "}";