diff --git a/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
index 0e97159b6..b99743132 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -25,6 +25,7 @@ import edu.cornell.mannlib.vedit.util.FormUtils;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 
 public class BaseEditController extends VitroHttpServlet {
@@ -171,6 +172,20 @@ public class BaseEditController extends VitroHttpServlet {
     	
     	return ontModel;
     	
+    }
+    
+    protected WebappDaoFactory getWebappDaoFactory(VitroRequest vreq) {
+        WebappDaoFactory wadf = (WebappDaoFactory) getServletContext().getAttribute(
+                "assertionsWebappDaoFactory");
+        if (wadf == null) {
+            log.info("Using vreq.getFullWebappDaoFactory()");
+            wadf = vreq.getFullWebappDaoFactory();
+        } 
+        return wadf;
+    }
+    
+    protected WebappDaoFactory getWebappDaoFactory(VitroRequest vreq, String userURI) {
+        return getWebappDaoFactory(vreq).getUserAwareDaoFactory(userURI);
     }
     
     public String getDefaultLandingPage(HttpServletRequest request) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
index 5decb70d3..440848469 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
@@ -77,15 +77,10 @@ public class EntityRetryController extends BaseEditController {
         } else {
             action = epo.getAction();
         }
-
-        WebappDaoFactory wadf = vreq.getAssertionsWebappDaoFactory();
-        if (wadf == null) {
-            log.info("Using vreq.getFullWebappDaoFactory()");
-            vreq.getFullWebappDaoFactory();
-        } 
         
         LoginStatusBean loginBean = LoginStatusBean.getBean(request);
-        WebappDaoFactory myWebappDaoFactory = wadf.getUserAwareDaoFactory(loginBean.getUserURI());
+        WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(
+                vreq, loginBean.getUserURI());
 
         IndividualDao ewDao = myWebappDaoFactory.getIndividualDao();
         epo.setDataAccessObject(ewDao);