diff --git a/config/src/main/java/com/typesafe/config/impl/Tokens.java b/config/src/main/java/com/typesafe/config/impl/Tokens.java
index 61a4679cd..abcee421b 100644
--- a/config/src/main/java/com/typesafe/config/impl/Tokens.java
+++ b/config/src/main/java/com/typesafe/config/impl/Tokens.java
@@ -26,7 +26,10 @@ AbstractConfigValue value() {
 
         @Override
         public String toString() {
-            return "'" + value().unwrapped() + "' (" + value.valueType().name() + ")";
+            if (value().resolveStatus() == ResolveStatus.RESOLVED)
+                return "'" + value().unwrapped() + "' (" + value.valueType().name() + ")";
+            else
+                return "'<unresolved value>' (" + value.valueType().name() + ")";
         }
 
         @Override