diff --git a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
index bb2253cae..a9a74c0a1 100644
--- a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
@@ -9,7 +9,7 @@
  -->
  
 <#assign rangeOptionsExist = true /> 
-
+<#assign rangeVClassURI = editConfiguration.objectPredicateProperty.rangeVClassURI!"" />
 <#assign objectTypes = editConfiguration.pageData.objectTypes />
 <#assign objectTypesSize = objectTypes?length />
 <#assign objectTypesExist = false />
@@ -40,7 +40,7 @@
 <#assign formTitle = editConfiguration.formTitle />
 <#if editConfiguration.formTitle?contains("collaborator") >
     <#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" />
-<#elseif editConfiguration.objectPredicateProperty.rangeVClassURI?contains("IAO_0000030")>
+<#elseif rangeVClassURI?contains("IAO_0000030")>
     <#assign formTitle = "${i18n().select_an_existing_document}" + " ${i18n().for} " + editConfiguration.subjectName/>
 </#if>
 <#--In order to fill out the subject-->
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
index 489e07a8e..85c4a96c5 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
@@ -7,8 +7,8 @@
     
     <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}"/>
     <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
-    <input type="hidden" name="domainUri" value="${editConfiguration.domainUri}"/>
-    <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri}"/>
+    <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}"/>
+    <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}"/>
     <input type="hidden" name="cmd"          value="delete"/>
     <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
     <#if editConfiguration.dataProperty = true>