Index: /binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs
===================================================================
--- /binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs	(revision 157)
+++ /binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs	(revision 158)
@@ -26,13 +26,15 @@
 				resp.StatusCode = (int)HttpStatusCode.Forbidden;
 			} else {
-				try {
-					foreach (KeyValuePair<string, WebAPI> kvp in apis) {
+				foreach (KeyValuePair<string, WebAPI> kvp in apis) {
+					try {
 						if (apiName.StartsWith (kvp.Key)) {
 							kvp.Value.HandleRequest (req, resp, user);
 							return;
 						}
+					} catch (Exception e) {
+						Log.Out ("Error in ApiHandler.HandleRequest(): Handler threw an exception: " + e);
+						resp.StatusCode = (int)HttpStatusCode.InternalServerError;
+						return;
 					}
-				} catch (Exception e) {
-					resp.StatusCode = (int)HttpStatusCode.InternalServerError;
 				}
 			}
Index: /binary-improvements/bin/Release/7dtd-server-fixes_version.txt
===================================================================
--- /binary-improvements/bin/Release/7dtd-server-fixes_version.txt	(revision 157)
+++ /binary-improvements/bin/Release/7dtd-server-fixes_version.txt	(revision 158)
@@ -1,1 +1,1 @@
-Version:       0.91.5359.21630
+Version:       0.91.5359.24216