Index: lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java
===================================================================
diff -u -r911aa099f3960c3b6cff064f37e7f52533e32ced -r877c6ce4786426422d4e9fad0eac1bf237db2bcf
--- lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java	(.../OutputFactory.java)	(revision 911aa099f3960c3b6cff064f37e7f52533e32ced)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java	(.../OutputFactory.java)	(revision 877c6ce4786426422d4e9fad0eac1bf237db2bcf)
@@ -294,6 +294,13 @@
 	 */
 	protected String[] splitConditionName(String conditionName) {
 		int index = conditionName.indexOf(CONDITION_NAME_SEPARATOR);
-		return new String[] { conditionName.substring(0,index), conditionName.substring(index) };
+		if ( index > -1 ) {
+			if ( index+1<conditionName.length())
+				return new String[] { conditionName.substring(0,index), conditionName.substring(index+1) };
+			else
+				return new String[] { conditionName.substring(0,index), "" };
+		} else {
+			return new String[] { conditionName, ""};
+		}
 	}
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java
===================================================================
diff -u -r911aa099f3960c3b6cff064f37e7f52533e32ced -r877c6ce4786426422d4e9fad0eac1bf237db2bcf
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java	(.../VoteOutputFactory.java)	(revision 911aa099f3960c3b6cff064f37e7f52533e32ced)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java	(.../VoteOutputFactory.java)	(revision 877c6ce4786426422d4e9fad0eac1bf237db2bcf)
@@ -136,16 +136,16 @@
 	private boolean checkDisplayOrderOfVoteQueContent(String name, VoteQueUsr queUser) {
 		
 		String[] dcNames = splitConditionName(name);
-		if ( dcNames[1].length() <= OUTPUT_NAME_NOMINATION_SELECTION.length()) {
-			log.error("Unable to convert the display order to an int for tool output "+ OUTPUT_NAME_NOMINATION_SELECTION+". Returning false. Name doesn't contain the display order."+name);
+		if ( dcNames[1] == null || dcNames[1].length() == 0) {
+			log.error("Unable to convert the display order to an int for tool output "+ OUTPUT_NAME_NOMINATION_SELECTION+". Returning false. Name doesn't contain the display order. Condition name was: "+name);
 			return false;
 		}
 
 		int displayOrder = 0;
 		try {
 			displayOrder = new Integer(dcNames[1]).intValue();
 		} catch ( NumberFormatException e) {
-			log.error("Unable to convert the display order to an int for tool output "+ OUTPUT_NAME_NOMINATION_SELECTION+". Returning false. Number format exception thrown. Condition name was:"+name,e);
+			log.error("Unable to convert the display order to an int for tool output "+ OUTPUT_NAME_NOMINATION_SELECTION+". Returning false. Number format exception thrown. Condition name was: "+name,e);
 			return false;
 		}
 		
@@ -163,7 +163,8 @@
 						return true;
 					} else {
 						VoteQueContent nomination = attempt.getVoteQueContent();
-						return nomination.getDisplayOrder() == displayOrder;
+						if (nomination.getDisplayOrder() == displayOrder )
+							return true;
 					}
 				}
 			}