Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -rec9ea9fdf7eb93270691702019ae6da2d8bf24ae -rd2477516d8148b43bc007b7cff9f0ef01813fca1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision ec9ea9fdf7eb93270691702019ae6da2d8bf24ae)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision d2477516d8148b43bc007b7cff9f0ef01813fca1)
@@ -709,7 +709,7 @@
 	    showResultsBoolean = true;
 	}
 
-	if (!"0".equals(maxInputs)) {
+	if (maxInputs != null && !"0".equals(maxInputs)) {
 	    maxInputsShort = Short.parseShort(maxInputs);
 	}
 
@@ -1286,7 +1286,7 @@
 	    showResultsBoolean = true;
 	}
 
-	if (!"0".equals(maxInputs)) {
+	if (maxInputs != null && !"0".equals(maxInputs)) {
 	    maxInputsShort = Short.parseShort(maxInputs);
 	}
 
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rd2477516d8148b43bc007b7cff9f0ef01813fca1
--- lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_vote/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision d2477516d8148b43bc007b7cff9f0ef01813fca1)
@@ -76,15 +76,17 @@
 	
 	
 	function onSelectDataInput(){
-		if (noneDataFlowSelectedPreviously && !document.getElementById("dataFlowNoneOption").selected){
-				document.getElementById("maxInputs").disabled=false;		
-					
+	if (document.getElementById("dataFlowNoneOption")!=null){
+			if (noneDataFlowSelectedPreviously && !document.getElementById("dataFlowNoneOption").selected){
+					document.getElementById("maxInputs").disabled=false;		
+						
+			}
+			else if (!noneDataFlowSelectedPreviously && document.getElementById("dataFlowNoneOption").selected){
+					document.getElementById("dataFlowLimitNoneOption").selected=true;
+					document.getElementById("maxInputs").disabled=true;		
+			}
+			noneDataFlowSelectedPreviously = document.getElementById("dataFlowNoneOption").selected;
 		}
-		else if (!noneDataFlowSelectedPreviously && document.getElementById("dataFlowNoneOption").selected){
-				document.getElementById("dataFlowLimitNoneOption").selected=true;
-				document.getElementById("maxInputs").disabled=true;		
-		}
-		noneDataFlowSelectedPreviously = document.getElementById("dataFlowNoneOption").selected;
 	}
 
 </script>
@@ -129,15 +131,15 @@
 <p>
 	<c:if
 		test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}">
-		<a  href="showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+		<a  href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.nomination" /> </a>
 	</c:if>
 	
 	<c:if
 		test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}">
 		<a
-			href="showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+			href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.nomination" /> </a>
 	</c:if>