diff --git a/MTSC/MTSC.csproj b/MTSC/MTSC.csproj
index 1cfc4d4..45c06fe 100644
--- a/MTSC/MTSC.csproj
+++ b/MTSC/MTSC.csproj
@@ -5,12 +5,12 @@
     <TargetFrameworks>netcoreapp2.1;net48;netstandard2.0;netcoreapp3.0</TargetFrameworks>
     <ApplicationIcon />
     <StartupObject />
-    <Version>1.3.7</Version>
+    <Version>1.3.8</Version>
     <Authors>Alexandru-Victor Macocian</Authors>
     <Product>MTSC</Product>
     <Description>Modular TCP Server and Client</Description>
-    <AssemblyVersion>0.1.3.7</AssemblyVersion>
-    <FileVersion>0.1.3.7</FileVersion>
+    <AssemblyVersion>0.1.3.8</AssemblyVersion>
+    <FileVersion>0.1.3.8</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Platforms>AnyCPU;x64</Platforms>
     <PackageProjectUrl>https://github.com/AlexMacocian/MTSC</PackageProjectUrl>
diff --git a/MTSC/Server/Handlers/HttpRoutingHandler.cs b/MTSC/Server/Handlers/HttpRoutingHandler.cs
index b394b05..034602d 100644
--- a/MTSC/Server/Handlers/HttpRoutingHandler.cs
+++ b/MTSC/Server/Handlers/HttpRoutingHandler.cs
@@ -90,7 +90,16 @@ namespace MTSC.Server.Handlers
                 (var module, var routeEnabler) = moduleDictionary[request.Method][request.RequestURI];
                 if(routeEnabler.Invoke(request, client))
                 {
-                    server.QueueMessage(client, module.HandleRequest(request, client, server).GetPackedResponse(true));
+                    try
+                    {
+                        server.QueueMessage(client, module.HandleRequest(request, client, server).GetPackedResponse(true));
+                    }
+                    catch(Exception e)
+                    {
+                        server.LogDebug("Exception: " + e.Message);
+                        server.LogDebug("Stacktrace: " + e.StackTrace);
+                        server.QueueMessage(client, new HttpResponse() { StatusCode = StatusCodes.InternalServerError }.GetPackedResponse(true));
+                    }
                     return true;
                 }
                 else