diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
index 32d0fdbd0..a2a1a083e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
@@ -408,9 +408,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
     	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
-		//ObjectPropertyStatementTemplate Model should pass the object key as part of the delete url
-		String objectKey = vreq.getParameter("objectKey");
-		statementDisplay.put(objectKey, objectUri);
+		
 		//Set data map
 		Map params = vreq.getParameterMap();
 		for (Object key : params.keySet()) {
@@ -422,6 +420,16 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 	        }
 	    }
 		
+		
+		//If no statement parameters being sent back, then just pass back null
+		if(statementDisplay.size() == 0) {
+			return null;
+		}
+		
+		//ObjectPropertyStatementTemplate Model should pass the object key as part of the delete url
+		String objectKey = vreq.getParameter("objectKey");
+		statementDisplay.put(objectKey, objectUri);
+		
 		//Using object property statement template model here
 		ObjectPropertyStatementTemplateModel osm = new ObjectPropertyStatementTemplateModel(
 				subjectUri, 
diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index 545d8e520..52760812d 100644
--- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -4,7 +4,9 @@
 
 <#if editConfiguration.objectProperty = true>
     <#assign toBeDeletedClass = "objProp" />
-    <#assign statement = editConfiguration.objectStatementDisplay />
+    <#if editConfiguration.objectStatementDisplay?has_content>
+    	<#assign statement = editConfiguration.objectStatementDisplay />
+    </#if>
 <#else>
 	<#assign statement = editConfiguration.dataStatementDisplay />
 </#if>