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 00fd7e13b..cedb9bde0 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
@@ -108,9 +108,9 @@ public class GroupedPropertyList extends BaseTemplateModel {
         
         if (editing) {
             mergeAllPossibleDataProperties(propertyList);
-            propertyList = correctLanguageForProperties(propertyList);
         }
         
+        propertyList = correctLanguageForProperties(propertyList);
         sort(propertyList);
 
         // Put the list into groups
diff --git a/webapp/web/error.jsp b/webapp/web/error.jsp
index 07a8a2e37..566e53673 100755
--- a/webapp/web/error.jsp
+++ b/webapp/web/error.jsp
@@ -5,7 +5,19 @@
 <%@ page import="com.oreilly.servlet.ServletUtils,edu.cornell.mannlib.vitro.webapp.web.*" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean"%>
+<%@page import="org.apache.commons.logging.Log"%>
+<%@page import="org.apache.commons.logging.LogFactory"%>
 <%
+   // We have seen that this page can throw its own error. 
+   // Before it does so, be sure that we have written the original error to the log.
+    Object c = request.getAttribute("javax.servlet.jsp.jspException");
+    if (c instanceof Throwable) {
+      Throwable cause = (Throwable) c;
+      Log log = LogFactory.getLog(this.getClass());
+      log.error("Error: ", cause);
+    }
+   
+   
             VitroRequest vreq = new VitroRequest(request);
             ApplicationBean appBean = vreq.getAppBean();
             String themeDir = appBean.getThemeDir();                        
diff --git a/webapp/web/js/vitroUtils.js b/webapp/web/js/vitroUtils.js
index ee9f88e08..e910efa74 100644
--- a/webapp/web/js/vitroUtils.js
+++ b/webapp/web/js/vitroUtils.js
@@ -5,7 +5,7 @@ $(document).ready(function(){
     // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing 
     // pages, overwrites $.
     // fade out welcome-message when user logs in
-    $.extend(this, i18nStrings);
+    jQuery.extend(this, i18nStrings);
     
     jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500);