Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8 -r0c0c3c9f3e428a5fdeb5721b450a89fbe2c340c6
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rc99ac4e72ae3c8db8627c38f7e31afd0f6e469d8 -r0c0c3c9f3e428a5fdeb5721b450a89fbe2c340c6
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r7c8ff663c07662a984677b2ed751754346226590 -r0c0c3c9f3e428a5fdeb5721b450a89fbe2c340c6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 0c0c3c9f3e428a5fdeb5721b450a89fbe2c340c6)
@@ -46,6 +46,9 @@
  * @version 2.1
  **/
 class ToolOutputConditionsDialog extends MovieClip implements Dialog {
+	private static var STP_MAX:Number = 9999;
+	private static var STP_MIN:Number = 0;
+	
 	//References to components + clips 
     private var _container:MovieClip;  //The container window that holds the dialog
     
@@ -383,10 +386,10 @@
 					return false;
 				}
 			} else { 
-				if(start_value >= condition.startValue && start_value <= condition.endValue) {
+				if(start_value >= condition.startValue && start_value <= condition.endValue && start_value != null) {
 					LFMessage.showMessageAlert(Dictionary.getValue("to_condition_invalid_value_range", [Dictionary.getValue("to_condition_start_value")]), null);
 					return false;
-				} else if(end_value >= condition.startValue && end_value <= condition.endValue) {
+				} else if(end_value >= condition.startValue && end_value <= condition.endValue && end_value != null) {
 					LFMessage.showMessageAlert(Dictionary.getValue("to_condition_invalid_value_range", [Dictionary.getValue("to_condition_end_value")]), null);
 					return false;
 				}
@@ -425,13 +428,13 @@
 				_start_value_stp.visible = true;
 				_end_value_stp.visible = !_opt_greaterThan_cb.value;
 				
-				_start_value_stp.minimum = Number(_selectedDefinition.startValue);
-				_end_value_stp.minimum = Number(_selectedDefinition.startValue);
-				_start_value_stp.maximum = Number(_selectedDefinition.endValue);
-				_end_value_stp.maximum = Number(_selectedDefinition.endValue);
+				_start_value_stp.minimum = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
+				_end_value_stp.minimum = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
+				_start_value_stp.maximum = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MAX;
+				_end_value_stp.maximum = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MAX;
 				
-				_start_value_stp.value = Number(_selectedDefinition.startValue);
-				_end_value_stp.value = Number(_selectedDefinition.endValue);
+				_start_value_stp.value = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
+				_end_value_stp.value = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MIN;
 				
 				_opt_greaterThan_cb.visible = true;
 				_opt_greaterThan_lbl.visible = true;
@@ -497,6 +500,7 @@
 	
 	private function onGreaterThanSelect(evt:Object):Void {
 		_end_value_stp.visible = !evt.target.value;
+		_condition_to_lbl.visible = !evt.target.value;
 	}
 
 	public static function getOutputType(type:String):String {