diff --git a/Version Control.accda.src/forms/frmVCSSplitFiles.bas b/Version Control.accda.src/forms/frmVCSSplitFiles.bas
index 9958cbb7..a73b3411 100644
--- a/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
+++ b/Version Control.accda.src/forms/frmVCSSplitFiles.bas	
@@ -1012,7 +1012,7 @@ Private Sub cmdSplitFiles_Click()
             AddToArray strPaths, varPaths(0)
             AddToArray strNew, varPaths(1)
         Else
-            If UBound(varPaths) = 0 And Trim(varPaths(0)) = vbNullString Then
+            If Len(Trim(varEntries(lngLine))) = 0 Then
                 ' Ignore blank lines
             Else
                 strError = "Expecting two file paths, separated by | character. See line: '" & varPaths(0) & "'"
@@ -1033,7 +1033,7 @@ Private Sub cmdSplitFiles_Click()
 
         ' Require clean branch with git installation
         If Not Git.IsCleanBranch Then strError = "Cannot split files in Git when changes are present in the branch"
-        If Not Git.GitInstalled Then strError = "Git must be installed to use this tool."
+        If Not Git.Installed Then strError = "Git must be installed to use this tool."
 
         ' Make sure we don't have any errors with the Git commands
         If Len(strError) Then
diff --git a/Version Control.accda.src/modules/clsGitIntegration.cls b/Version Control.accda.src/modules/clsGitIntegration.cls
index 8b71d0cf..e30e355b 100644
--- a/Version Control.accda.src/modules/clsGitIntegration.cls	
+++ b/Version Control.accda.src/modules/clsGitIntegration.cls	
@@ -183,7 +183,7 @@ Public Function GetRepositoryRoot(Optional blnFallBackToWorking As Boolean = Tru
     strWorking = GetWorkingFolder
 
     ' Make sure git is actually installed
-    If Not Me.GitInstalled Then
+    If Not Me.Installed Then
         If blnFallBackToWorking Then GetRepositoryRoot = strWorking
         Exit Function
     End If
@@ -272,7 +272,7 @@ End Function
 '---------------------------------------------------------------------------------------
 '
 Public Function IsInsideRepository() As Boolean
-    If Me.GitInstalled Then
+    If Me.Installed Then
         IsInsideRepository = (RunGitCommand(egcIsInsideTree) = "true")
     End If
 End Function
@@ -524,8 +524,8 @@ End Function
 ' Purpose   : Returns true if git is installed.
 '---------------------------------------------------------------------------------------
 '
-Public Function GitInstalled() As Boolean
-    GitInstalled = (Len(Me.Version))
+Public Function Installed() As Boolean
+    Installed = (Len(Me.Version))
 End Function
 
 
diff --git a/Version Control.accda.src/modules/clsOptions.cls b/Version Control.accda.src/modules/clsOptions.cls
index 1247615e..9769b4f8 100644
--- a/Version Control.accda.src/modules/clsOptions.cls	
+++ b/Version Control.accda.src/modules/clsOptions.cls	
@@ -336,7 +336,7 @@ Private Function HasUnifiedLayoutFilesInGit(strExportPath As String) As Boolean
 
     If blnHasFiles Then
         ' Check to see if this folder is in a git repository
-        If Git.GitInstalled Then
+        If Git.Installed Then
             ' Check export path
             Git.WorkingFolder = strExportPath
             HasUnifiedLayoutFilesInGit = Git.IsInsideRepository