Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -rc706d5556d5ca50d6430e922a3436201590c41eb
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c706d5556d5ca50d6430e922a3436201590c41eb)
@@ -700,7 +700,7 @@
      */
     private void populateItemToForm(int itemIdx, SurveyQuestion item, QuestionForm form, HttpServletRequest request) {
 	// fetch question from DB rather than from HTTP session so we can lazy load its options
-	item = surveyService.getQuestion(item.getUid());
+	item = item.getUid() == null ? item : surveyService.getQuestion(item.getUid());
 
 	if (itemIdx >= 0) {
 	    form.setItemIndex(new Integer(itemIdx).toString());