diff --git a/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
index fd010347c..e660ad3d5 100644
--- a/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
+++ b/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
@@ -19,8 +19,6 @@ public class UpdateServiceFixture : CoreTest<UpdateService>
     {
         private string _sandboxFolder;
 
-        private readonly Guid _clientGuid = Guid.NewGuid();
-
         private readonly UpdatePackage _updatePackage = new UpdatePackage
         {
             FileName = "NzbDrone.kay.one.0.6.0.2031.zip",
@@ -100,19 +98,12 @@ public void Should_copy_update_client_to_root_of_sandbox()
         [Test]
         public void should_start_update_client()
         {
-            var updateClientPath = Mocker.GetMock<IEnvironmentProvider>().Object.GetUpdateClientExePath();
-
-
-
             Subject.Execute(new ApplicationUpdateCommand());
 
-
-
             Mocker.GetMock<IProcessProvider>().Verify(
                c => c.Start(It.Is<ProcessStartInfo>(p =>
-                       p.FileName == updateClientPath &&
-                       p.Arguments == "12 " + _clientGuid.ToString())
-                       ));
+                       !string.IsNullOrWhiteSpace(p.FileName) &&
+                       p.Arguments == "12")));
         }
 
         [Test]
diff --git a/NzbDrone.Core/Update/UpdateService.cs b/NzbDrone.Core/Update/UpdateService.cs
index 8c924a600..90310c36f 100644
--- a/NzbDrone.Core/Update/UpdateService.cs
+++ b/NzbDrone.Core/Update/UpdateService.cs
@@ -76,7 +76,7 @@ private void InstallUpdate(UpdatePackage updatePackage)
             var startInfo = new ProcessStartInfo
                 {
                     FileName = _environmentProvider.GetUpdateClientExePath(),
-                    Arguments = string.Format("{0} {1}", _processProvider.GetCurrentProcess().Id)
+                    Arguments = _processProvider.GetCurrentProcess().Id.ToString()
                 };
 
             var process = _processProvider.Start(startInfo);
diff --git a/NzbDrone.Update/Program.cs b/NzbDrone.Update/Program.cs
index 624119eb8..4a5433681 100644
--- a/NzbDrone.Update/Program.cs
+++ b/NzbDrone.Update/Program.cs
@@ -53,9 +53,9 @@ public void Start(string[] args)
         private int ParseProcessId(string[] args)
         {
             int id;
-            if (args ==null || !Int32.TryParse(args[0], out id) || id <= 0)
+            if (args == null || !Int32.TryParse(args[0], out id) || id <= 0)
             {
-                throw new ArgumentOutOfRangeException("Invalid process id: " + args[0]);
+                throw new ArgumentOutOfRangeException("args", "Invalid process ID");
             }
 
             logger.Debug("NzbDrone processId:{0}", id);