Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.50 -r1.51
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	4 Aug 2006 14:13:21 -0000	1.50
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	16 Aug 2006 22:18:08 -0000	1.51
@@ -426,14 +426,22 @@
 		if (qaContent.getTitle() == null)
 		{
 			qaGeneralAuthoringDTO.setActivityTitle("Q&A Title");
-			qaGeneralAuthoringDTO.setActivityInstructions("Q&A Instructions");
 		}
 		else
 		{
 			qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle());
+		}
+
+		
+		if (qaContent.getInstructions() == null)
+		{
+		    qaGeneralAuthoringDTO.setActivityInstructions("Q&A Instructions");
+		}
+		else
+		{
 			qaGeneralAuthoringDTO.setActivityInstructions( qaContent.getInstructions());
-			
 		}
+		
 		sessionMap.put(ACTIVITY_TITLE_KEY, qaGeneralAuthoringDTO.getActivityTitle());
 	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, qaGeneralAuthoringDTO.getActivityInstructions());