Index: Migration/Console/test/Migration.Console.Test/RingtoetsMigrationToolTest.cs
===================================================================
diff -u -rac7794620453f0360ef356df931800debf13353c -rb5aa83e7766c6fccd8ad0bc55eca6548c3da43de
--- Migration/Console/test/Migration.Console.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision ac7794620453f0360ef356df931800debf13353c)
+++ Migration/Console/test/Migration.Console.Test/RingtoetsMigrationToolTest.cs	(.../RingtoetsMigrationToolTest.cs)	(revision b5aa83e7766c6fccd8ad0bc55eca6548c3da43de)
@@ -265,8 +265,8 @@
             }
 
             // Result
-            Assert.AreEqual("Er is een onverwachte fout opgetreden tijdens het verplaatsen van het gemigreerde bestand."
-                            + Environment.NewLine, consoleText);
+            Assert.That(consoleText.StartsWith("Er is een onverwachte fout opgetreden tijdens het verplaatsen van het gemigreerde bestand "));
+            Assert.That(consoleText.EndsWith($" naar '{targetFilePath}'." + Environment.NewLine));
             Assert.AreEqual(22, environmentControl.ErrorCodeCalled);
         }
     }
Index: Migration/Core/src/Migration.Core.Storage/Properties/Resources.Designer.cs
===================================================================
diff -u -r535a93fde55619f58673f758edae5dc7c1b9df51 -rb5aa83e7766c6fccd8ad0bc55eca6548c3da43de
--- Migration/Core/src/Migration.Core.Storage/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 535a93fde55619f58673f758edae5dc7c1b9df51)
+++ Migration/Core/src/Migration.Core.Storage/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b5aa83e7766c6fccd8ad0bc55eca6548c3da43de)
@@ -84,7 +84,7 @@
         /// <summary>
         ///   Looks up a localized string similar to /* ---------------------------------------------------- */
         ////*  Generated by Enterprise Architect Version 12.0 		*/
-        ////*  Created On : 12-Jan-2017 2:31:23 PM 				*/
+        ////*  Created On : 20-Jan-2017 8:34:09 AM 				*/
         ////*  DBMS       : SQLite 								*/
         ////* ---------------------------------------------------- */
         ///
@@ -109,5 +109,14 @@
                 return ResourceManager.GetString("DatabaseStructure", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Er is een onverwachte fout opgetreden tijdens het verplaatsen van het gemigreerde bestand &apos;{0}&apos; naar &apos;{1}&apos;..
+        /// </summary>
+        internal static string Migrate_Unable_To_Move_From_Location_0_To_Location_1 {
+            get {
+                return ResourceManager.GetString("Migrate_Unable_To_Move_From_Location_0_To_Location_1", resourceCulture);
+            }
+        }
     }
 }
Index: Migration/Core/src/Migration.Core.Storage/Properties/Resources.resx
===================================================================
diff -u -r535a93fde55619f58673f758edae5dc7c1b9df51 -rb5aa83e7766c6fccd8ad0bc55eca6548c3da43de
--- Migration/Core/src/Migration.Core.Storage/Properties/Resources.resx	(.../Resources.resx)	(revision 535a93fde55619f58673f758edae5dc7c1b9df51)
+++ Migration/Core/src/Migration.Core.Storage/Properties/Resources.resx	(.../Resources.resx)	(revision b5aa83e7766c6fccd8ad0bc55eca6548c3da43de)
@@ -121,4 +121,7 @@
   <data name="DatabaseStructure" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\..\..\..\build\databasestructure.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="Migrate_Unable_To_Move_From_Location_0_To_Location_1" xml:space="preserve">
+    <value>Er is een onverwachte fout opgetreden tijdens het verplaatsen van het gemigreerde bestand '{0}' naar '{1}'.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Migration/Core/src/Migration.Core.Storage/VersionedFileMigrator.cs
===================================================================
diff -u -r7b09e29a12bb9207e3ed23dba4771007f7d948d5 -rb5aa83e7766c6fccd8ad0bc55eca6548c3da43de
--- Migration/Core/src/Migration.Core.Storage/VersionedFileMigrator.cs	(.../VersionedFileMigrator.cs)	(revision 7b09e29a12bb9207e3ed23dba4771007f7d948d5)
+++ Migration/Core/src/Migration.Core.Storage/VersionedFileMigrator.cs	(.../VersionedFileMigrator.cs)	(revision b5aa83e7766c6fccd8ad0bc55eca6548c3da43de)
@@ -25,6 +25,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using Migration.Core.Storage.Properties;
 using Migration.Scripts.Data;
 using Migration.Scripts.Data.Exceptions;
 using MigrationScriptsDataResources = Migration.Scripts.Data.Properties.Resources;
@@ -78,7 +79,9 @@
         /// </summary>
         /// <param name="fromVersionedFile">The source versioned file to migrate from.</param>
         /// <param name="toVersion">The version to upgrade to.</param>
-        /// <param name="newFileLocation"></param>
+        /// <param name="newFileLocation">The location where the migrated file needs to be saved.</param>
+        /// <exception cref="CriticalDatabaseMigrationException">Thrown when moving the migrated file 
+        /// from a temporary environment to <paramref name="newFileLocation"/>.</exception>
         public void Migrate(VersionedFile fromVersionedFile, string toVersion, string newFileLocation)
         {
             var supportedMigrationScripts = migrationScripts
@@ -106,7 +109,9 @@
                 }
                 catch (IOException exception)
                 {
-                    throw new CriticalDatabaseMigrationException("Er is een onverwachte fout opgetreden tijdens het verplaatsen van het gemigreerde bestand.", exception);
+                    var message = string.Format(Resources.Migrate_Unable_To_Move_From_Location_0_To_Location_1,
+                                                upgradedVersionFile.Location, newFileLocation);
+                    throw new CriticalDatabaseMigrationException(message, exception);
                 }
             }
         }