diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/InfosetImpl.scala b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/InfosetImpl.scala
index 7d14db9c15..311057bc38 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/InfosetImpl.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/InfosetImpl.scala
@@ -335,7 +335,12 @@ sealed abstract class InfosetNoDataExceptionBase(
case class InfosetNoDataException(
override val diElement: DIElement,
override val erd: ElementRuntimeData
-) extends InfosetNoDataExceptionBase(diElement, erd, "Element does not have a value.")
+) extends InfosetNoDataExceptionBase(
+ diElement,
+ erd,
+ "Element does not have a value. " +
+ "This may indicate a circular dependency in the schema."
+ )
case class InfosetSelfReferencingException(
override val diElement: DIElement,
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml
index c8a226f4fa..549cef2799 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml
@@ -994,4 +994,127 @@
a
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ ABCDEFG
+
+
+
+
+ not have a value
+ circular dependency
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ ABCDEFG
+
+
+
+
+ not have a value
+ circular dependency
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ABCDEFG
+
+
+
+ ABCDE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ABCDEFG
+
+
+
+
+ Value length unknown
+
+
+
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala
index 93b2725784..c380450f2f 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala
@@ -79,4 +79,10 @@ class TestUnparserGeneral extends TdmlTests {
@Test def emptyOutputNewLine1 = test
@Test def unparseIgnorableContent = test
+
+ // DFDL-1598
+ @Test def truncatedString_1 = test
+ @Test def truncatedString_2 = test
+ @Test def truncatedString_3 = test
+ @Test def truncatedString_4 = test
}