diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
index a3ddc4cd8..a1981b4d5 100644
--- a/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
@@ -76,11 +76,21 @@ namespace TBF.BenchControl.DataEntry.iPerl
 
 		private void okButton_Click(object sender, EventArgs e)
         {
-			PurchaseOrder = orderComboBox.Text;
-			Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
+            if (orderComboBox.Text.Length > 8)
+            {
+                MessageBox.Show(string.Format(Strings.Purchase_order_may_have_max_N_characters, 8),
+                                Strings.Error,
+                                MessageBoxButtons.OK,
+                                MessageBoxIcon.Exclamation);
+            }
+            else
+            {
+                PurchaseOrder = orderComboBox.Text;
+                Program.LocalSettings.UpdateHistory(orderComboBox.Text, ref Program.LocalSettings.PurchaseOrderHistory);
 
-            completed = true;
-            Close();
+                completed = true;
+                Close();
+            }
         }
 
 
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 5233a6858..d4f74730b 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.8.308.1")]
-[assembly: AssemblyFileVersion("2.8.308.1")]
+[assembly: AssemblyVersion("2.8.309.1")]
+[assembly: AssemblyFileVersion("2.8.309.1")]
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index d68efab54..32a5e7b48 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -2481,6 +2481,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Purchase order may have max {0} characters.
+        /// </summary>
+        internal static string Purchase_order_may_have_max_N_characters {
+            get {
+                return ResourceManager.GetString("Purchase_order_may_have_max_N_characters", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Fill the test bench with water?.
         /// </summary>
diff --git a/TestBenchFramework/Resources/Strings.cs.resx b/TestBenchFramework/Resources/Strings.cs.resx
index 456d4b391..44212cd72 100644
--- a/TestBenchFramework/Resources/Strings.cs.resx
+++ b/TestBenchFramework/Resources/Strings.cs.resx
@@ -1215,4 +1215,7 @@
   <data name="PO" xml:space="preserve">
     <value>Obj.</value>
   </data>
+  <data name="Purchase_order_may_have_max_N_characters" xml:space="preserve">
+    <value>Objednávka může mít maximálně {0} znaků</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index e875913d1..3d90d0ff7 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -1420,4 +1420,7 @@
   <data name="PO" xml:space="preserve">
     <value>PO</value>
   </data>
+  <data name="Purchase_order_may_have_max_N_characters" xml:space="preserve">
+    <value>Purchase order may have max {0} characters</value>
+  </data>
 </root>
\ No newline at end of file