diff --git a/Samples/ServerClientSample/Run.bat b/Samples/ServerClientSample/Run.bat
index dbbaa59..f262cac 100644
--- a/Samples/ServerClientSample/Run.bat
+++ b/Samples/ServerClientSample/Run.bat
@@ -2,12 +2,12 @@ set currPath="%cd%
 set serverPath="%cd%\Server\bin\net47"
 set clientPath="%cd%\Client\bin\net47"
 
-if NOT EXIST %serverApp% (
+if NOT EXIST %serverPath%\Server.exe (
   echo Build 'Server' project first.
   goto :eof
 )
 
-if NOT EXIST %clientApp% (
+if NOT EXIST %clientPath%\Client.exe (
   echo Build 'Client' project first.
   goto :eof
 )
@@ -15,7 +15,10 @@ if NOT EXIST %clientApp% (
 cd %serverPath%
 start Server.exe
 timeout /T 1  > nul
+
 cd %clientPath%
 start Client.exe
+timeout /T 1  > nul
+start Client.exe
 
 cd %currPath%
\ No newline at end of file
diff --git a/Source/WebSocketRPC.JS/Components/JsDocGenerator.cs b/Source/WebSocketRPC.JS/Components/JsDocGenerator.cs
index d322e06..07139ce 100644
--- a/Source/WebSocketRPC.JS/Components/JsDocGenerator.cs
+++ b/Source/WebSocketRPC.JS/Components/JsDocGenerator.cs
@@ -176,7 +176,7 @@ static string getReturn(XmlNode node)
 
         static string getTypeName(Type type)
         {
-            if (type.GetGenericTypeDefinition() != typeof(Task<>))
+            if (!type.IsGenericType || type.GetGenericTypeDefinition() != typeof(Task<>))
                 return type.Name;
 
             return type.GenericTypeArguments.First().Name + " (Task)";