=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java	2015-07-03 11:01:19 +0000
@@ -121,7 +121,7 @@
     {
         return "AttributeValue{" +
             "id=" + id +
-            ", attribute=" + attribute +
+            ", attribute=" + ( attribute != null ? attribute.getUid() : "" ) +
             ", value='" + value + '\'' +
             '}';
     }