Index: /branches/eraser6/Eraser/TaskPropertiesForm.Designer.cs
===================================================================
--- /branches/eraser6/Eraser/TaskPropertiesForm.Designer.cs	(revision 138)
+++ /branches/eraser6/Eraser/TaskPropertiesForm.Designer.cs	(revision 139)
@@ -29,4 +29,5 @@
 		private void InitializeComponent()
 		{
+			this.components = new System.ComponentModel.Container();
 			this.nameLbl = new System.Windows.Forms.Label();
 			this.name = new System.Windows.Forms.TextBox();
@@ -83,4 +84,5 @@
 			this.scheduleTime = new System.Windows.Forms.MaskedTextBox();
 			this.scheduleTimeLbl = new System.Windows.Forms.Label();
+			this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
 			this.container.SuspendLayout();
 			this.containerTask.SuspendLayout();
@@ -99,4 +101,5 @@
 			((System.ComponentModel.ISupportInitialize)(this.oneTimeBitmap)).BeginInit();
 			this.scheduleTimePanel.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
 			this.SuspendLayout();
 			// 
@@ -170,5 +173,5 @@
 			this.data.Location = new System.Drawing.Point(9, 93);
 			this.data.Name = "data";
-			this.data.Size = new System.Drawing.Size(324, 256);
+			this.data.Size = new System.Drawing.Size(324, 254);
 			this.data.TabIndex = 7;
 			this.data.UseCompatibleStateImageBehavior = false;
@@ -188,5 +191,5 @@
 			// 
 			this.dataAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.dataAdd.Location = new System.Drawing.Point(9, 355);
+			this.dataAdd.Location = new System.Drawing.Point(9, 353);
 			this.dataAdd.Name = "dataAdd";
 			this.dataAdd.Size = new System.Drawing.Size(75, 23);
@@ -205,4 +208,5 @@
 			this.ok.Text = "OK";
 			this.ok.UseVisualStyleBackColor = true;
+			this.ok.Click += new System.EventHandler(this.ok_Click);
 			// 
 			// cancel
@@ -731,4 +735,8 @@
 			this.scheduleTimeLbl.TabIndex = 3;
 			this.scheduleTimeLbl.Text = "Run this task at:";
+			// 
+			// errorProvider
+			// 
+			this.errorProvider.ContainerControl = this;
 			// 
 			// TaskPropertiesForm
@@ -771,4 +779,5 @@
 			this.scheduleTimePanel.ResumeLayout(false);
 			this.scheduleTimePanel.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
 			this.ResumeLayout(false);
 
@@ -831,4 +840,5 @@
 		private System.Windows.Forms.MaskedTextBox scheduleTime;
 		private System.Windows.Forms.Label scheduleTimeLbl;
+		private System.Windows.Forms.ErrorProvider errorProvider;
 	}
 }
Index: /branches/eraser6/Eraser/TaskPropertiesForm.resx
===================================================================
--- /branches/eraser6/Eraser/TaskPropertiesForm.resx	(revision 138)
+++ /branches/eraser6/Eraser/TaskPropertiesForm.resx	(revision 139)
@@ -118,3 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
Index: /branches/eraser6/Eraser/TaskPropertiesForm.cs
===================================================================
--- /branches/eraser6/Eraser/TaskPropertiesForm.cs	(revision 138)
+++ /branches/eraser6/Eraser/TaskPropertiesForm.cs	(revision 139)
@@ -36,6 +36,8 @@
 					else
 						throw new NotImplementedException("Unimplemented data erasure type.");
+					
 					item.SubItems.Add(entry.Method.Name);
 					task.Entries.Add(entry);
+					errorProvider.Clear();
 				}
 			}
@@ -89,4 +91,29 @@
 		}
 
+		private void ok_Click(object sender, EventArgs e)
+		{
+			if (data.Items.Count == 0)
+			{
+				errorProvider.SetIconPadding(data, -16);
+				errorProvider.SetError(data, "The task has no data to erase.");
+				return;
+			}
+
+			errorProvider.Clear();
+
+			//Set the name of the task
+			task.Name = name.Text;
+
+			//And the schedule, if selected.
+			if (typeRecurring.Checked)
+			{
+
+			}
+
+			//Close the dialog
+			DialogResult = DialogResult.OK;
+			Close();
+		}
+
 		private Task task = new Task();
 	}
