1 files changed, 10 insertions, 0 deletions

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
index 8846739a..aad3d34d 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
@@ -82,6 +82,11 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             // Bind the schema msi.
             this.GenerateDatabase(schemaData);
 
+            if (this.Messaging.EncounteredError)
+            {
+                return transform;
+            }
+
             var transformViewTable = this.OpenTransformViewForAddedAndModifiedRows(schemaDatabasePath);
 
             var addedRows = this.CreatePlaceholdersForModifiedRowsAndIndexAddedRows(schemaData, transformViewTable);
@@ -89,6 +94,11 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             // Re-bind the schema output with the placeholder rows over top the original schema database.
             this.GenerateDatabase(schemaData);
 
+            if (this.Messaging.EncounteredError)
+            {
+                return transform;
+            }
+
             this.PopulateTransformFromView(schemaDatabasePath, transform, transformViewTable, addedRows);
 
             return transform;