diff --git a/Version Control.accda.src/modules/modSanitize.bas b/Version Control.accda.src/modules/modSanitize.bas
index 2e284b39..5eb760be 100644
--- a/Version Control.accda.src/modules/modSanitize.bas	
+++ b/Version Control.accda.src/modules/modSanitize.bas	
@@ -394,8 +394,12 @@ Private Sub CloseBlock()
 
     ' Skip if we are not using themes for this control (UseTheme=0)
     ' (Applies to "CommandButton", "Tab", "ToggleButton")
-    If dBlock.Exists("UseTheme") Then Exit Sub
-
+    If dBlock.Exists("UseTheme") Then 
+		' Remove this block
+        m_colBlocks.Remove m_colBlocks.Count
+		Exit Sub
+	End If
+	
     ' Build array of base properties
     varBase = Array("Back", "AlternateBack", "Border", _
             "Fore", "Gridline", "HoverFore", _
@@ -618,7 +622,11 @@ Public Function SanitizeXML(strPath As String, blnReturnHash As Boolean) As Stri
         Set objXml = New MSXML2.DOMDocument60
     End If
 
-    objXml.LoadXML strFile
+    If objXml.LoadXML(strFile) = False Then
+        Log.Error eelError, _
+                "Unable to parse the XML for file '" & strPath & "'. This may be due to containing malformed XML. Check the source XML document for validity. In some cases, this may be due to table data containing characters not allowed in XML documents.", ModuleName & ".SanitizeXML"
+        Exit Function
+    End If
 
     ' Determine if it's a table data with schema
     For Each objNode In objXml.SelectNodes("/root/dataroot")
diff --git a/Version Control.accda.src/modules/modVCSUtility.bas b/Version Control.accda.src/modules/modVCSUtility.bas
index 40c424b9..b15f3b4d 100644
--- a/Version Control.accda.src/modules/modVCSUtility.bas	
+++ b/Version Control.accda.src/modules/modVCSUtility.bas	
@@ -794,7 +794,7 @@ Public Sub CheckGitFiles()
     Dim strFile As String
     Dim blnAdded As Boolean
 
-    strPath = CurrentProject.Path & PathSep
+    strPath = Options.GetExportFolder
     If FSO.FolderExists(strPath & ".git") Then
 
         ' gitignore file