diff --git a/OCUploadDownloadServer/OCDaemonHoster/OCDaemonHoster.csproj b/OCUploadDownloadServer/OCDaemonHoster/OCDaemonHoster.csproj
index 26a5dff..e1b7dc6 100644
--- a/OCUploadDownloadServer/OCDaemonHoster/OCDaemonHoster.csproj
+++ b/OCUploadDownloadServer/OCDaemonHoster/OCDaemonHoster.csproj
@@ -6,11 +6,12 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Exe</OutputType>
     <RootNamespace>OCDaemonHoster</RootNamespace>
-    <AssemblyName>OCDaemonHoster</AssemblyName>
+    <AssemblyName>OCDH</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <ApplicationIcon>..\Icon2.ico</ApplicationIcon>
     <NoWin32Manifest>False</NoWin32Manifest>
+    <StartupObject>OCDaemonHoster.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -22,6 +23,7 @@
     <Optimize>False</Optimize>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <StartAction>Project</StartAction>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <OutputPath>bin\Release\</OutputPath>
diff --git a/OCUploadDownloadServer/OCDaemonHoster/OCNetworkClient.cs b/OCUploadDownloadServer/OCDaemonHoster/OCNetworkClient.cs
index ad921af..ab00246 100644
--- a/OCUploadDownloadServer/OCDaemonHoster/OCNetworkClient.cs
+++ b/OCUploadDownloadServer/OCDaemonHoster/OCNetworkClient.cs
@@ -118,6 +118,7 @@ namespace captainalm.network.oc
 						try {
 							Thread.Sleep(100);
 						} catch (ThreadInterruptedException e) {
+							break;
 						}
 						lout++;
 					}
diff --git a/OCUploadDownloadServer/OCDaemonHoster/OCNetworkListener.cs b/OCUploadDownloadServer/OCDaemonHoster/OCNetworkListener.cs
index 4e8e53b..ba876c6 100644
--- a/OCUploadDownloadServer/OCDaemonHoster/OCNetworkListener.cs
+++ b/OCUploadDownloadServer/OCDaemonHoster/OCNetworkListener.cs
@@ -111,6 +111,7 @@ namespace captainalm.network.oc
 				try {
 					Thread.Sleep(100);
 				} catch (ThreadInterruptedException e) {
+					break;
 				}
 			}
 			sSock = null;
@@ -122,6 +123,7 @@ namespace captainalm.network.oc
 					try {
 						Thread.Sleep(100);
 					} catch (ThreadInterruptedException e) {
+						break;
 					}
 				}
 				try {
@@ -136,6 +138,7 @@ namespace captainalm.network.oc
 						try {
 							Thread.Sleep(100);
 						} catch (ThreadInterruptedException e) {
+							break;
 						}
 					}
 				} catch (SocketException e) {
diff --git a/OCUploadDownloadServer/OCDaemonHoster/Program.cs b/OCUploadDownloadServer/OCDaemonHoster/Program.cs
index fe0e3d6..c95397e 100644
--- a/OCUploadDownloadServer/OCDaemonHoster/Program.cs
+++ b/OCUploadDownloadServer/OCDaemonHoster/Program.cs
@@ -108,6 +108,7 @@ namespace OCDaemonHoster
 				try {
 					Thread.Sleep(100);
 				} catch (ThreadInterruptedException e) {
+					break;
 				}
 			}
 			server.close();
@@ -196,7 +197,7 @@ namespace OCDaemonHoster
 				if (isSwitch && !hasEquals) {
 					cSwitch = carg.Substring(1).ToLower();
 				} else if (isSwitch && hasEquals) {
-					cSwitch = carg.Substring(1, carg.IndexOf("=")).ToLower();
+					cSwitch = carg.Substring(1, carg.IndexOf("=") - 1).ToLower();
 					cValue = carg.Substring(carg.IndexOf("=") + 1);
 				}
 				if (!settings.ContainsKey(cSwitch)) {
diff --git a/OCUploadDownloadServer/OCUploadDownloadServer.sln b/OCUploadDownloadServer/OCUploadDownloadServer.sln
index e0566e4..5205094 100644
--- a/OCUploadDownloadServer/OCUploadDownloadServer.sln
+++ b/OCUploadDownloadServer/OCUploadDownloadServer.sln
@@ -4,6 +4,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # SharpDevelop 4.4
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OCUploadDownloadServer", "OCUploadDownloadServer\OCUploadDownloadServer.vbproj", "{2FE6A11F-332C-4E6D-B161-E4F775FE53C0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OCDaemonHoster", "OCDaemonHoster\OCDaemonHoster.csproj", "{08F6D48F-9EAB-4861-9D50-F9F1BC10C074}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -14,5 +16,9 @@ Global
 		{2FE6A11F-332C-4E6D-B161-E4F775FE53C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FE6A11F-332C-4E6D-B161-E4F775FE53C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FE6A11F-332C-4E6D-B161-E4F775FE53C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08F6D48F-9EAB-4861-9D50-F9F1BC10C074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08F6D48F-9EAB-4861-9D50-F9F1BC10C074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08F6D48F-9EAB-4861-9D50-F9F1BC10C074}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08F6D48F-9EAB-4861-9D50-F9F1BC10C074}.Release|Any CPU.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 EndGlobal