diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
index a8c1e21e84..d470528c9c 100644
--- a/RetailCoder.VBE/App.cs
+++ b/RetailCoder.VBE/App.cs
@@ -19,12 +19,12 @@ public class App : IDisposable
     {
         private readonly VBE _vbe;
         private readonly AddIn _addIn;
-        private readonly IList<IInspection> _inspections;
-        private readonly Inspector _inspector;
-        private readonly ParserErrorsPresenter _parserErrorsPresenter;
+        private IList<IInspection> _inspections;
+        private Inspector _inspector;
+        private ParserErrorsPresenter _parserErrorsPresenter;
         private readonly IGeneralConfigService _configService = new ConfigurationLoader();
         private readonly ActiveCodePaneEditor _editor;
-        private readonly IRubberduckParser _parser;
+        private IRubberduckParser _parser;
 
         private Configuration _config;
         private RubberduckMenu _menu;
@@ -35,18 +35,12 @@ public App(VBE vbe, AddIn addIn)
         {
             _vbe = vbe;
             _addIn = addIn;
-            _inspections = _configService.GetImplementedCodeInspections();
 
-            _parser = new RubberduckParser();
             _parserErrorsPresenter = new ParserErrorsPresenter(vbe, addIn);
-            _parser.ParseStarted += _parser_ParseStarted;
-            _parser.ParserError += _parser_ParserError;
             _configService.SettingsChanged += _configService_SettingsChanged;
 
             _editor = new ActiveCodePaneEditor(vbe);
 
-            _inspector = new Inspector(_parser, _inspections);
-
             LoadConfig();
         }
 
@@ -71,8 +65,6 @@ private void LoadConfig()
                 _configService.SaveConfiguration(_config);
             }
 
-            EnableCodeInspections(_config);
-
             if (_menu != null)
             {
                 _menu.Dispose();
@@ -92,6 +84,31 @@ private void LoadConfig()
                 _codeInspectionsToolbar.Dispose();
             }
 
+            if (_inspector != null)
+            {
+                _inspector.Dispose();
+            }
+
+            if (_parserErrorsPresenter != null)
+            {
+                _parserErrorsPresenter.Dispose();
+            }
+
+            if (_parser != null)
+            {
+                _parser.ParseStarted -= _parser_ParseStarted;
+                _parser.ParserError -= _parser_ParserError;
+            }
+            _parser = new RubberduckParser();
+            _parser.ParseStarted += _parser_ParseStarted;
+            _parser.ParserError += _parser_ParserError;
+
+            _inspections = _configService.GetImplementedCodeInspections();
+            _inspector = new Inspector(_parser, _inspections);
+            EnableCodeInspections(_config);
+
+            _parserErrorsPresenter = new ParserErrorsPresenter(_vbe, _addIn);
+
             _menu = new RubberduckMenu(_vbe, _addIn, _configService, _parser, _editor, _inspector);
             _menu.Initialize();
 
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
index f3ba570568..6027a7db77 100644
--- a/RetailCoder.VBE/Rubberduck.csproj
+++ b/RetailCoder.VBE/Rubberduck.csproj
@@ -1073,10 +1073,12 @@
   </Target>
   <Import Project="..\packages\Antlr4.4.3.0\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.3.0\build\Antlr4.targets')" />
   <PropertyGroup>
-    <PostBuildEvent>c:\Windows\Microsoft.NET\Framework64\v4.0.30319\regasm.exe "$(TargetPath)" /codebase /tlb</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>c:\Windows\Microsoft.NET\Framework64\v4.0.30319\regasm.exe "$(TargetPath)" /u</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- 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.
diff --git a/RetailCoder.VBE/UI/FolderBrowser.cs b/RetailCoder.VBE/UI/FolderBrowser.cs
index e675de75a2..7984fcc7dc 100644
--- a/RetailCoder.VBE/UI/FolderBrowser.cs
+++ b/RetailCoder.VBE/UI/FolderBrowser.cs
@@ -27,7 +27,7 @@ public FolderBrowser(string description, bool showNewFolderButton, Environment.S
         }
 
         public FolderBrowser(string description, bool showNewFolderButton)
-            :this(description, showNewFolderButton, Environment.SpecialFolder.MyDocuments)
+            :this(description, showNewFolderButton, Environment.SpecialFolder.MyComputer)
         { }
 
         public FolderBrowser(string description)
diff --git a/RetailCoder.VBE/UI/RubberduckMenu.cs b/RetailCoder.VBE/UI/RubberduckMenu.cs
index a76c7d3e6f..7115bb0986 100644
--- a/RetailCoder.VBE/UI/RubberduckMenu.cs
+++ b/RetailCoder.VBE/UI/RubberduckMenu.cs
@@ -217,7 +217,6 @@ protected override void Dispose(bool disposing)
             menuBarControls.Parent.FindControl(_menu.Type, _menu.Id, _menu.Tag, _menu.Visible).Delete();
 
             _disposed = true;
-
             base.Dispose(true);
         }
     }
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
index 0583182ec3..faab5d3293 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
+++ b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -2337,6 +2337,15 @@ internal static string SourceControl_NewBranch {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to No repository found..
+        /// </summary>
+        internal static string SourceControl_NoRepoFound {
+            get {
+                return ResourceManager.GetString("SourceControl_NoRepoFound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open Working Directory.
         /// </summary>
diff --git a/RetailCoder.VBE/UI/RubberduckUI.fr.resx b/RetailCoder.VBE/UI/RubberduckUI.fr.resx
index 0716a99306..75c8aef01f 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.fr.resx
+++ b/RetailCoder.VBE/UI/RubberduckUI.fr.resx
@@ -1049,4 +1049,7 @@ Attention: les valeurs personnalisées seront perdues.</value>
   <data name="SourceControl_MergeFormTitle" xml:space="preserve">
     <value>Fusionner les branches</value>
   </data>
+  <data name="SourceControl_NoRepoFound" xml:space="preserve">
+    <value>z No repository found.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
index a8738350fb..08f1d6e0c3 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.resx
+++ b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1053,4 +1053,7 @@ Are you sure you want to proceed with this rename?</value>
   <data name="SourceControl_MergeFormTitle" xml:space="preserve">
     <value>Merge branches</value>
   </data>
+  <data name="SourceControl_NoRepoFound" xml:space="preserve">
+    <value>No repository found.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/RubberduckUI.sv.resx b/RetailCoder.VBE/UI/RubberduckUI.sv.resx
index 8d0169b21a..68996fe662 100644
--- a/RetailCoder.VBE/UI/RubberduckUI.sv.resx
+++ b/RetailCoder.VBE/UI/RubberduckUI.sv.resx
@@ -1040,4 +1040,7 @@ Are you sure you want to proceed with this rename?</value>
   <data name="SourceControl_MergeFormTitle" xml:space="preserve">
     <value>z Merge branches</value>
   </data>
+  <data name="SourceControl_NoRepoFound" xml:space="preserve">
+    <value>z No repository found.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs b/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs
index c3200d640c..4bb45efff9 100644
--- a/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs
+++ b/RetailCoder.VBE/UI/Settings/GeneralSettingsControl.cs
@@ -7,7 +7,8 @@ namespace Rubberduck.UI.Settings
 {
     public partial class GeneralSettingsControl : UserControl
     {
-        private IGeneralConfigService _configService;
+        private readonly IGeneralConfigService _configService;
+        private readonly DisplayLanguageSetting _currentLanguage;
 
         public GeneralSettingsControl()
         {
@@ -36,13 +37,14 @@ private void ResetSettings()
         {
             File.Delete(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Rubberduck\\rubberduck.config"));
             var config = _configService.GetDefaultConfiguration();
-            _configService.SaveConfiguration(config);
+            _configService.SaveConfiguration(config, !Equals(_currentLanguage, config.UserSettings.LanguageSetting));
         }
 
         public GeneralSettingsControl(DisplayLanguageSetting displayLanguage, IGeneralConfigService configService)
             : this()
         {
             _configService = configService;
+            _currentLanguage = displayLanguage;
             LanguageList.SelectedItem = displayLanguage;
         }
 
diff --git a/RetailCoder.VBE/UI/Settings/SettingsDialog.cs b/RetailCoder.VBE/UI/Settings/SettingsDialog.cs
index 1c681cd76e..715554d78f 100644
--- a/RetailCoder.VBE/UI/Settings/SettingsDialog.cs
+++ b/RetailCoder.VBE/UI/Settings/SettingsDialog.cs
@@ -165,10 +165,12 @@ private void ActivateControl(Control control)
 
         private void SaveConfig()
         {
+            var langChanged = !Equals(_config.UserSettings.LanguageSetting, _generalSettingsView.SelectedLanguage);
+
             _config.UserSettings.LanguageSetting = _generalSettingsView.SelectedLanguage;
             _config.UserSettings.ToDoListSettings.ToDoMarkers = _todoView.TodoMarkers.ToArray();
             // The datagrid view of the CodeInspectionControl seems to keep the config magically in sync, so I don't manually do it here.
-            _configService.SaveConfiguration(_config);
+            _configService.SaveConfiguration(_config, langChanged);
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs b/RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs
index 97209ea2cd..a5ea7f5cca 100644
--- a/RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs
+++ b/RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs
@@ -124,6 +124,7 @@ private void HideCreateBranchView()
 
         private void OnShowCreateBranchView(object sender, EventArgs e)
         {
+            if (_view.Local == null) { return; }
             _createView.Show();
         }
 
@@ -141,11 +142,15 @@ private void OnCreateViewCancel(object sender, EventArgs e)
 
         private void OnCreateBranchTextChanged(object sender, EventArgs e)
         {
-            _createView.OkButtonEnabled = !string.IsNullOrEmpty(_createView.UserInputText);
+            _createView.OkButtonEnabled = !string.IsNullOrEmpty(_createView.UserInputText) &&
+                                          !_view.Local.Contains(_createView.UserInputText) &&
+                                          !_createView.UserInputText.Any(char.IsWhiteSpace);
         }
 
         private void OnShowMerge(object sender, EventArgs e)
         {
+            if (_view.Local == null) { return; }
+
             var localBranchNames = _view.Local.ToList();
             _mergeView.SourceSelectorData = localBranchNames;
             _mergeView.DestinationSelectorData = localBranchNames;
diff --git a/RetailCoder.VBE/UI/SourceControl/CreateBranchForm.Designer.cs b/RetailCoder.VBE/UI/SourceControl/CreateBranchForm.Designer.cs
index f067a7f2f6..77a8e53ffa 100644
--- a/RetailCoder.VBE/UI/SourceControl/CreateBranchForm.Designer.cs
+++ b/RetailCoder.VBE/UI/SourceControl/CreateBranchForm.Designer.cs
@@ -47,7 +47,7 @@ private void InitializeComponent()
             // UserInputBox
             // 
             this.UserInputBox.Location = new System.Drawing.Point(20, 108);
-            this.UserInputBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.UserInputBox.Margin = new System.Windows.Forms.Padding(4);
             this.UserInputBox.Name = "UserInputBox";
             this.UserInputBox.Size = new System.Drawing.Size(385, 22);
             this.UserInputBox.TabIndex = 0;
@@ -58,7 +58,7 @@ private void InitializeComponent()
             this.CancelButton.BackColor = System.Drawing.SystemColors.ButtonFace;
             this.CancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.CancelButton.Location = new System.Drawing.Point(308, 14);
-            this.CancelButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CancelButton.Margin = new System.Windows.Forms.Padding(4);
             this.CancelButton.Name = "CancelButton";
             this.CancelButton.Size = new System.Drawing.Size(100, 28);
             this.CancelButton.TabIndex = 0;
@@ -70,7 +70,7 @@ private void InitializeComponent()
             this.OkButton.BackColor = System.Drawing.SystemColors.ButtonFace;
             this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
             this.OkButton.Location = new System.Drawing.Point(200, 14);
-            this.OkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OkButton.Margin = new System.Windows.Forms.Padding(4);
             this.OkButton.Name = "OkButton";
             this.OkButton.Size = new System.Drawing.Size(100, 28);
             this.OkButton.TabIndex = 1;
@@ -85,7 +85,7 @@ private void InitializeComponent()
             this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
             this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 164);
-            this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
             this.flowLayoutPanel2.Name = "flowLayoutPanel2";
             this.flowLayoutPanel2.Padding = new System.Windows.Forms.Padding(11, 10, 0, 10);
             this.flowLayoutPanel2.Size = new System.Drawing.Size(423, 53);
@@ -98,7 +98,7 @@ private void InitializeComponent()
             this.InstructionsLabel.Location = new System.Drawing.Point(12, 37);
             this.InstructionsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.InstructionsLabel.Name = "InstructionsLabel";
-            this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.InstructionsLabel.Padding = new System.Windows.Forms.Padding(5);
             this.InstructionsLabel.Size = new System.Drawing.Size(397, 42);
             this.InstructionsLabel.TabIndex = 6;
             this.InstructionsLabel.Text = "Please specify branch name.";
@@ -122,7 +122,7 @@ private void InitializeComponent()
             this.panel1.Controls.Add(this.TitleLabel);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(423, 87);
             this.panel1.TabIndex = 13;
@@ -130,7 +130,7 @@ private void InitializeComponent()
             // InvalidNameValidationIcon
             // 
             this.InvalidNameValidationIcon.Image = global::Rubberduck.Properties.Resources.cross_circle;
-            this.InvalidNameValidationIcon.Location = new System.Drawing.Point(396, 100);
+            this.InvalidNameValidationIcon.Location = new System.Drawing.Point(397, 100);
             this.InvalidNameValidationIcon.Margin = new System.Windows.Forms.Padding(4);
             this.InvalidNameValidationIcon.Name = "InvalidNameValidationIcon";
             this.InvalidNameValidationIcon.Size = new System.Drawing.Size(16, 16);
@@ -149,7 +149,7 @@ private void InitializeComponent()
             this.Controls.Add(this.UserInputBox);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = global::Rubberduck.UI.RubberduckUI.Ducky;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.MinimumSize = new System.Drawing.Size(394, 174);
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs
index 7e7c2ebbdb..a315346433 100644
--- a/RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs
+++ b/RetailCoder.VBE/UI/SourceControl/SourceControlPresenter.cs
@@ -91,7 +91,17 @@ private void OnOpenWorkingDirectory(object sender, EventArgs e)
 
                 var project = this.VBE.ActiveVBProject;
                 var repo = new Repository(project.Name, folderPicker.SelectedPath, string.Empty);
-                _provider = _providerFactory.CreateProvider(project, repo);
+
+                try
+                {
+                    _provider = _providerFactory.CreateProvider(project, repo);
+                }
+                catch (SourceControlException)
+                {
+                    MessageBox.Show(RubberduckUI.SourceControl_NoRepoFound, RubberduckUI.SourceControlPanel_Caption,
+                        MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    return;
+                }
 
                 AddRepoToConfig(repo);
 
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlProviderFactory.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlProviderFactory.cs
index f995d5fd0b..217b7b6d14 100644
--- a/RetailCoder.VBE/UI/SourceControl/SourceControlProviderFactory.cs
+++ b/RetailCoder.VBE/UI/SourceControl/SourceControlProviderFactory.cs
@@ -23,7 +23,14 @@ public ISourceControlProvider CreateProvider(VBProject project)
 
         public ISourceControlProvider CreateProvider(VBProject project, IRepository repository)
         {
-            return new GitProvider(project, repository);
+            try
+            {
+                return new GitProvider(project, repository);
+            }
+            catch (SourceControlException e)
+            {
+                throw;
+            }
         }
     }
 }
diff --git a/RubberduckTests/SourceControl/BranchesPresenterTests.cs b/RubberduckTests/SourceControl/BranchesPresenterTests.cs
index d5c01a6350..01b63cd0de 100644
--- a/RubberduckTests/SourceControl/BranchesPresenterTests.cs
+++ b/RubberduckTests/SourceControl/BranchesPresenterTests.cs
@@ -117,6 +117,8 @@ public void HeadIsNotIncludedInPublishedBranches()
         public void CreateBranchViewIsShownOnCreateBranch()
         {
             //arrange
+            _view.SetupProperty(v => v.Local, new List<string>());
+
             //act
             _view.Raise(v => v.CreateBranch += null, new EventArgs());
 
@@ -124,6 +126,72 @@ public void CreateBranchViewIsShownOnCreateBranch()
             _createView.Verify(c => c.Show(), Times.Once());
         }
 
+        [TestMethod]
+        public void CreateBranch_AndBranchExists()
+        {
+            //arrange
+            var branchName = "master";
+            var branches = new List<string>() { branchName };
+
+            _view.SetupProperty(v => v.Local, branches);
+            _createView.SetupProperty(c => c.UserInputText, branchName);
+            _createView.SetupProperty(c => c.OkButtonEnabled);
+
+            //act
+            _createView.Raise(c => c.UserInputTextChanged += null, new EventArgs());
+
+            //Assert
+            Assert.IsFalse(_createView.Object.OkButtonEnabled);
+        }
+
+        [TestMethod]
+        public void CreateBranch_AndValidBranchName()
+        {
+            //arrange
+            var existingBranchName = "master";
+            var newBranchName = "bugBranch";
+            var branches = new List<string>() { existingBranchName };
+
+            _view.SetupProperty(v => v.Local, branches);
+            _createView.SetupProperty(c => c.UserInputText, newBranchName);
+            _createView.SetupProperty(c => c.OkButtonEnabled);
+
+            //act
+            _createView.Raise(c => c.UserInputTextChanged += null, new EventArgs());
+
+            //Assert
+            Assert.IsTrue(_createView.Object.OkButtonEnabled);
+        }
+
+        [TestMethod]
+        public void CreateBranch_WithNameAsMultipleWords()
+        {
+            //arrange
+            var branchName = "my master";
+            var branches = new List<string>() { branchName };
+
+            _view.SetupProperty(v => v.Local, branches);
+            _createView.SetupProperty(c => c.UserInputText, branchName);
+            _createView.SetupProperty(c => c.OkButtonEnabled);
+
+            //act
+            _createView.Raise(c => c.UserInputTextChanged += null, new EventArgs());
+
+            //Assert
+            Assert.IsFalse(_createView.Object.OkButtonEnabled);
+        }
+
+        [TestMethod]
+        public void CreateBranchViewIsNotShownWhenLocal_IsNull()
+        {
+            //arrange
+            //act
+            _view.Raise(v => v.CreateBranch += null, new EventArgs());
+
+            //Assert
+            _createView.Verify(c => c.Show(), Times.Never());
+        }
+
         [TestMethod]
         public void ProviderCallsCreateBranchOnCreateBranchConfirm()
         {
@@ -176,6 +244,19 @@ public void MergeViewIsShownOnMergeClick()
             _mergeView.Verify(m => m.Show(), Times.Once);
         }
 
+        [TestMethod]
+        public void MergeViewIsNotShownWhenLocal_IsNull()
+        {
+            //arrange
+            _view.SetupProperty(v => v.Local); //no default value, so v.Local is null
+
+            //act
+            _view.Raise(v => v.Merge += null, new EventArgs());
+
+            //assert
+            _mergeView.Verify(m => m.Show(), Times.Never);
+        }
+
         [TestMethod]
         public void MergeViewSourceBranchesAreSetBeforeShowing()
         {