diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 4b45522..cde5438 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -86,6 +86,19 @@ namespace PepperDash.Core
 		public GenericTcpIpClient(string key, string address, int port, int bufferSize)
 			: base(key)
 		{
+			if (string.IsNullOrEmpty(address))
+			{
+				Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", key);
+				return;
+			}
+			if (port < 1 || port > 65535)
+			{
+				{
+					Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': Invalid port", key);
+					return;
+				}
+			}
+
 			Client = new TCPClient(address, port, bufferSize);
 			Client.SocketStatusChange += Client_SocketStatusChange;
 		}
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
index 3e42cb4..24fafa4 100644
--- a/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
+++ b/Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj	
@@ -78,18 +78,6 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <FlavorProperties GUID="{0B4745B0-194B-4BB6-8E21-E9057CA92500}">
-        <ProgramIdTag>PepperDash_Core</ProgramIdTag>
-        <SystemName>PepperDash_Core</SystemName>
-        <Programmer />
-        <ArchiveFilename>C:\Users\hvolm\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz</ArchiveFilename>
-        <MinFirmwareVersion>1.007.0017</MinFirmwareVersion>
-        <CompiledOn>9/27/2016 5:17:31 PM</CompiledOn>
-        <AdditionalInfo />
-        <EmbedSourceArchive>False</EmbedSourceArchive>
-        <CopyTo />
-        <OriginalReferenceSources />
-      </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo
new file mode 100644
index 0000000..eadee59
Binary files /dev/null and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz
index 11358db..f609fdf 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config
index 8ff292e..f10d936 100644
--- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
+++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config	
@@ -10,7 +10,11 @@
     <ArchiveName />
   </RequiredInfo>
   <OptionalInfo>
-    <CompiledOn>9/27/2016 5:17:31 PM</CompiledOn>
-    <CompilerRev>1.0.0.29325</CompilerRev>
+    <CompiledOn>10/18/2016 12:34:49 PM</CompiledOn>
+    <CompilerRev>1.0.0.20775</CompilerRev>
   </OptionalInfo>
+  <Plugin>
+    <Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
+    <Include4.dat />
+  </Plugin>
 </ProgramInfo>
\ No newline at end of file
diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll
index acf38fd..5d04044 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info
index ba28745..dc1e75a 100644
--- a/Pepperdash Core/Pepperdash Core/bin/manifest.info	
+++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info	
@@ -1,5 +1,6 @@
-MainAssembly=PepperDash_Core.dll:945e6c6366e369445585fb8cacdefe8e
+MainAssembly=PepperDash_Core.dll:59ea04ece7016e5dd5cfbefdb88bb5ab
 MainAssemblyMinFirmwareVersion=1.007.0017
+MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
 ü
 DependencySource=Newtonsoft.Json.Compact.dll:ea996aa2ec65aa1878e7c9d09e37a896
 DependencyPath=PepperDash_Core.clz:Newtonsoft.Json.Compact.dll
diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser
index f0933ea..074eeee 100644
Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ