diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
index 03b4cdd9a..60fbd3e60 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
@@ -45,8 +45,8 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
         
         String invalidConfigMessage = checkConfiguration();
         if ( ! invalidConfigMessage.isEmpty() ) {
-            throw new InvalidConfigurationException("Invalid configuration for property " + 
-                    op.getURI() + ":" + invalidConfigMessage); 
+            throw new InvalidConfigurationException("Invalid configuration for collated property " + 
+                    op.getURI() + ":" + invalidConfigMessage + ". Creating uncollated display instead."); 
         }
 
         /* Get the data */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
index 629c14f48..71277ac36 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
@@ -33,15 +33,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         super(dp, subject, policyHelper);
 
         setName(dp.getPublicName());
-        
-        // Determine whether a new statement can be added
-        if (policyHelper != null) {
-            RequestedAction action = new AddDataPropStmt(subjectUri, propertyUri,RequestActionConstants.SOME_LITERAL, null, null);
-            if (policyHelper.isAuthorizedAction(action)) {
-                addAccess = true;
-            }            
-        }
-        
+
         // Get the data property statements via a sparql query
         DataPropertyStatementDao dpDao = vreq.getWebappDaoFactory().getDataPropertyStatementDao();
         List<Literal> values = dpDao.getDataPropertyValuesForIndividualByProperty(subject, dp);
@@ -49,6 +41,17 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         for (Literal value : values) {
             statements.add(new DataPropertyStatementTemplateModel(subjectUri, propertyUri, value, policyHelper));
         }
+        
+        // Determine whether a new statement can be added
+        if (policyHelper != null) {
+            // If the display limit has already been reached, we can't add a new statement
+            if ( dp.getDisplayLimit() > statements.size() ) {
+                RequestedAction action = new AddDataPropStmt(subjectUri, propertyUri,RequestActionConstants.SOME_LITERAL, null, null);
+                if (policyHelper.isAuthorizedAction(action)) {
+                    addAccess = true;
+                }
+            }
+        }
     }
     
     /* Access methods for templates */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index 626a6e2be..27148b10c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -99,8 +99,8 @@ public class GroupedPropertyList extends BaseTemplateModel {
     
         // Build the template data model from the groupList
         groups = new ArrayList<PropertyGroupTemplateModel>(propertyGroupList.size());
-        for (PropertyGroup pg : propertyGroupList) {
-            groups.add(new PropertyGroupTemplateModel(vreq, pg, subject, policyHelper));
+        for (PropertyGroup propertyGroup: propertyGroupList) {
+            groups.add(new PropertyGroupTemplateModel(vreq, propertyGroup, subject, policyHelper));
         }   
     
     }
@@ -425,5 +425,6 @@ public class GroupedPropertyList extends BaseTemplateModel {
         }        
         return null;
     }
+
 }
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index aef940eee..750e93d11 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -141,7 +141,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
             try {
                 return new CollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper);
             } catch (InvalidConfigurationException e) {
-                log.error(e);
+                log.warn(e);
                 return new UncollatedObjectPropertyTemplateModel(op, subject, vreq, policyHelper);
             }
         } else {