Index: Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsCreateScript.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsCreateScript.cs	(.../RingtoetsCreateScript.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsCreateScript.cs	(.../RingtoetsCreateScript.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -47,10 +47,8 @@
         /// </list></exception>
         public RingtoetsCreateScript(string version, string query) : base(version)
         {
-            if (!RingtoetsVersionHelper.IsValidVersion(version))
-            {
-                throw new ArgumentException($@"{version} is not a valid Ringtoets database version.", nameof(version));
-            }
+            RingtoetsVersionHelper.ValidateVersion(version);
+
             if (string.IsNullOrWhiteSpace(query))
             {
                 throw new ArgumentException(@"Query must have a value.", nameof(query));
Index: Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsUpgradeScript.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsUpgradeScript.cs	(.../RingtoetsUpgradeScript.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsUpgradeScript.cs	(.../RingtoetsUpgradeScript.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -55,14 +55,8 @@
                 throw new ArgumentException(@"Query must have a value.", nameof(query));
             }
 
-            if (!RingtoetsVersionHelper.IsValidVersion(fromVersion))
-            {
-                throw new ArgumentException($@"{fromVersion} is not a valid Ringtoets database version.", nameof(fromVersion));
-            }
-            if (!RingtoetsVersionHelper.IsValidVersion(toVersion))
-            {
-                throw new ArgumentException($@"{toVersion} is not a valid Ringtoets database version.", nameof(toVersion));
-            }
+            RingtoetsVersionHelper.ValidateVersion(fromVersion);
+            RingtoetsVersionHelper.ValidateVersion(toVersion);
 
             upgradeQuery = query;
         }
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsCreateScriptTest.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsCreateScriptTest.cs	(.../RingtoetsCreateScriptTest.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsCreateScriptTest.cs	(.../RingtoetsCreateScriptTest.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -36,8 +36,7 @@
         [Test]
         [TestCase("")]
         [TestCase(null)]
-        [TestCase("4")]
-        public void Constructor_InvalidVersion_ThrowsArgumentException(string version)
+        public void Constructor_VersionOrEmpty_ThrowsArgumentException(string version)
         {
             // Setup
             const string query = "Valid query";
@@ -51,6 +50,21 @@
         }
 
         [Test]
+        [TestCase("4")]
+        public void Constructor_InvalidVersion_ThrowsArgumentException(string version)
+        {
+            // Setup
+            const string query = "Valid query";
+
+            // Call
+            TestDelegate call = () => new RingtoetsCreateScript(version, query);
+
+            // Assert
+            string expectedMessage = $@"'{version}' is geen geldige Ringtoets versie.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        [Test]
         [TestCase("")]
         [TestCase("   ")]
         [TestCase(null)]
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsUpgradeScriptTest.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsUpgradeScriptTest.cs	(.../RingtoetsUpgradeScriptTest.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsUpgradeScriptTest.cs	(.../RingtoetsUpgradeScriptTest.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -36,8 +36,7 @@
         [Test]
         [TestCase("")]
         [TestCase(null)]
-        [TestCase("4")]
-        public void Constructor_InvalidFromVersion_ThrowsArgumentException(string fromVersion)
+        public void Constructor_FromVersionOrEmpty_ThrowsArgumentException(string fromVersion)
         {
             // Setup
             const string query = "Valid query";
@@ -54,8 +53,7 @@
         [Test]
         [TestCase("")]
         [TestCase(null)]
-        [TestCase("4")]
-        public void Constructor_InvalidToVersion_ThrowsArgumentException(string toVersion)
+        public void Constructor_ToVersionOrEmpty_ThrowsArgumentException(string toVersion)
         {
             // Setup
             string fromVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
@@ -70,6 +68,38 @@
         }
 
         [Test]
+        [TestCase("4")]
+        public void Constructor_InvalidFromVersion_ThrowsArgumentException(string fromVersion)
+        {
+            // Setup
+            const string query = "Valid query";
+            string toVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
+
+            // Call
+            TestDelegate call = () => new RingtoetsUpgradeScript(fromVersion, toVersion, query);
+
+            // Assert
+            string expectedMessage = $@"'{fromVersion}' is geen geldige Ringtoets versie.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        [Test]
+        [TestCase("4")]
+        public void Constructor_InvalidToVersion_ThrowsArgumentException(string toVersion)
+        {
+            // Setup
+            string fromVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion();
+            const string query = "Valid query";
+
+            // Call
+            TestDelegate call = () => new RingtoetsUpgradeScript(fromVersion, toVersion, query);
+
+            // Assert
+            string expectedMessage = $@"'{toVersion}' is geen geldige Ringtoets versie.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        [Test]
         [TestCase("")]
         [TestCase("   ")]
         [TestCase(null)]
@@ -144,7 +174,7 @@
 
             // Assert
             Assert.IsTrue(File.Exists(filePath));
-            using (new FileDisposeHelper(filePath)) { }
+            using (new FileDisposeHelper(filePath)) {}
         }
     }
 }
\ No newline at end of file
Index: Migration/Console/src/Migration.Console/ConsoleHelper.cs
===================================================================
diff -u -r1fe151fcfd0dce8fa2c1d93243cae90eee991e70 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Migration/Console/src/Migration.Console/ConsoleHelper.cs	(.../ConsoleHelper.cs)	(revision 1fe151fcfd0dce8fa2c1d93243cae90eee991e70)
+++ Migration/Console/src/Migration.Console/ConsoleHelper.cs	(.../ConsoleHelper.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -82,17 +82,16 @@
             {
                 throw new ArgumentNullException(nameof(args));
             }
-            var windowWidth = GetWindowWidth() - paddingRight;
 
-            int bufferSize = windowWidth - paddingLeft;
+            int bufferSize = GetLineWidth() - paddingRight - paddingLeft;
             var paddingString = new string(' ', paddingLeft);
             foreach (var line in format.SplitByLength(bufferSize))
             {
                 SystemConsole.WriteLine($@"{paddingString}{line.TrimStart()}", args);
             }
         }
 
-        private static int GetWindowWidth()
+        private static int GetLineWidth()
         {
             try
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Utils/Properties/Resources.Designer.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/Properties/Resources.Designer.cs	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Ringtoets.Common.Utils.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.Common.Utils.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &apos;{0}&apos; is geen geldige Ringtoets versie..
+        /// </summary>
+        internal static string RingtoetsVersionHelper_Version_0_Not_Valid {
+            get {
+                return ResourceManager.GetString("RingtoetsVersionHelper_Version_0_Not_Valid", resourceCulture);
+            }
+        }
+    }
+}
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/Properties/Resources.resx
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Utils/Properties/Resources.resx	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/Properties/Resources.resx	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="RingtoetsVersionHelper_Version_0_Not_Valid" xml:space="preserve">
+    <value>'{0}' is geen geldige Ringtoets versie.</value>
+  </data>
+</root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/Ringtoets.Common.Utils.csproj
===================================================================
diff -u -r24fff72c73f0e43ad9f9fcf3a616ab0f8f96e077 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Ringtoets/Common/src/Ringtoets.Common.Utils/Ringtoets.Common.Utils.csproj	(.../Ringtoets.Common.Utils.csproj)	(revision 24fff72c73f0e43ad9f9fcf3a616ab0f8f96e077)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/Ringtoets.Common.Utils.csproj	(.../Ringtoets.Common.Utils.csproj)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -41,6 +41,11 @@
     </Compile>
     <Compile Include="AssignUnassignCalculations.cs" />
     <Compile Include="CalculationWithLocation.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="RingtoetsVersionComparer.cs" />
     <Compile Include="StructuresHelper.cs" />
     <Compile Include="SectionResultWithCalculationAssignment.cs" />
@@ -66,6 +71,12 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Common/src/Ringtoets.Common.Utils/RingtoetsVersionHelper.cs
===================================================================
diff -u -r946b237385a53349d539eb6432b808b7fd7295b2 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Ringtoets/Common/src/Ringtoets.Common.Utils/RingtoetsVersionHelper.cs	(.../RingtoetsVersionHelper.cs)	(revision 946b237385a53349d539eb6432b808b7fd7295b2)
+++ Ringtoets/Common/src/Ringtoets.Common.Utils/RingtoetsVersionHelper.cs	(.../RingtoetsVersionHelper.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -19,6 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Ringtoets.Common.Utils.Properties;
+
 namespace Ringtoets.Common.Utils
 {
     /// <summary>
@@ -56,10 +59,26 @@
         /// <param name="version">The version to compare.</param>
         /// <returns><c>true</c> if <paramref name="version"/> is a valid database version, 
         /// <c>false</c> otherwise.</returns>
+        /// <remarks>A valid version must be greater than <see cref="validDatabaseVersion"/>.</remarks>
         public static bool IsValidVersion(string version)
         {
             var versionComparer = new RingtoetsVersionComparer();
             return versionComparer.Compare(version, validDatabaseVersion) >= 0;
         }
+
+        /// <summary>
+        /// Validates if the <paramref name="version"/> is a valid database version.
+        /// </summary>
+        /// <param name="version">The version to compare.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="version"/> is not a 
+        /// valid Ringtoets database version.</exception>
+        /// <seealso cref="IsValidVersion"/>
+        public static void ValidateVersion(string version)
+        {
+            if (!IsValidVersion(version))
+            {
+                throw new ArgumentException(string.Format(Resources.RingtoetsVersionHelper_Version_0_Not_Valid, version), version);
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/RingtoetsVersionHelperTest.cs
===================================================================
diff -u -r946b237385a53349d539eb6432b808b7fd7295b2 -r9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/RingtoetsVersionHelperTest.cs	(.../RingtoetsVersionHelperTest.cs)	(revision 946b237385a53349d539eb6432b808b7fd7295b2)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/RingtoetsVersionHelperTest.cs	(.../RingtoetsVersionHelperTest.cs)	(revision 9487e717f5c13a44bdf7bc60cfa7fccb9a3fd84a)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 
 namespace Ringtoets.Common.Utils.Test
@@ -74,8 +76,7 @@
         }
 
         [Test]
-        [TestCase("5a.0")]
-        [TestCase("17..")]
+        [TestCaseSource(nameof(InValidVersions))]
         public void IsNewerThanCurrentString_InvalidVersion_ReturnsFalse(string invalidVersion)
         {
             // Call
@@ -86,8 +87,7 @@
         }
 
         [Test]
-        [TestCase("5")]
-        [TestCase("17")]
+        [TestCaseSource(nameof(ValidVersions))]
         public void IsValidVersion_ValidVersion_ReturnsTrue(string validVersion)
         {
             // Call
@@ -98,8 +98,7 @@
         }
 
         [Test]
-        [TestCase("4")]
-        [TestCase("..")]
+        [TestCaseSource(nameof(InValidVersions))]
         public void IsValidVersion_InvalidVersion_ReturnsFalse(string invalidVersion)
         {
             // Call
@@ -108,5 +107,47 @@
             // Assert
             Assert.IsFalse(isNewer);
         }
+
+        [Test]
+        [TestCaseSource(nameof(ValidVersions))]
+        public void ValidateVersion_ValidVersion_DoesNotThrowException(string validVersion)
+        {
+            // Call
+            TestDelegate call = () => RingtoetsVersionHelper.ValidateVersion(validVersion);
+
+            // Assert
+            Assert.DoesNotThrow(call);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(InValidVersions))]
+        public void ValidateVersion_InValidVersion_ThrowArgumentException(string validVersion)
+        {
+            // Call
+            TestDelegate call = () => RingtoetsVersionHelper.ValidateVersion(validVersion);
+
+            // Assert
+            string expectedMessage = $@"'{validVersion}' is geen geldige Ringtoets versie.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
+
+        private static TestCaseData[] ValidVersions()
+        {
+            return new[]
+            {
+                new TestCaseData("5"),
+                new TestCaseData("17.1")
+            };
+        }
+
+        private static TestCaseData[] InValidVersions()
+        {
+            return new[]
+            {
+                new TestCaseData("4"),
+                new TestCaseData("5a"),
+                new TestCaseData("..")
+            };
+        }
     }
 }
\ No newline at end of file