Index: binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs	(revision 154)
+++ binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs	(revision 156)
@@ -26,9 +26,13 @@
 				resp.StatusCode = (int)HttpStatusCode.Forbidden;
 			} else {
-				foreach (KeyValuePair<string, WebAPI> kvp in apis) {
-					if (apiName.StartsWith (kvp.Key)) {
-						kvp.Value.HandleRequest (req, resp, user);
-						return;
+				try {
+					foreach (KeyValuePair<string, WebAPI> kvp in apis) {
+						if (apiName.StartsWith (kvp.Key)) {
+							kvp.Value.HandleRequest (req, resp, user);
+							return;
+						}
 					}
+				} catch (Exception e) {
+					resp.StatusCode = (int)HttpStatusCode.InternalServerError;
 				}
 			}