Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r481ce9bf906ef6523ad3ac1c677c9d9a0166cc88 -r03c8964e39bdf13d230084187d2b5e0f42df3193
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 481ce9bf906ef6523ad3ac1c677c9d9a0166cc88)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 03c8964e39bdf13d230084187d2b5e0f42df3193)
@@ -62,14 +62,22 @@
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
 
+<c:set var="unableToSaveMsgKey" value="authoring.msg.one.question.to.be.saved" scope="request"/>
+
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
 	}
     function doSubmit_Form_Only() {
-    	$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
-    	document.getElementById("${formID}").submit();
+    	var length = $('#questionTable tr').size();
+
+		if( length <= 1 ) {
+        	alert("<fmt:message key='${unableToSaveMsgKey}'/>")
+		} else {
+	    	$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
+	    	document.getElementById("${formID}").submit();
+		}
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){