diff --git a/src/helma/servlet/AbstractServletClient.java b/src/helma/servlet/AbstractServletClient.java
index 0a349843..ec0641de 100644
--- a/src/helma/servlet/AbstractServletClient.java
+++ b/src/helma/servlet/AbstractServletClient.java
@@ -701,6 +701,9 @@ public abstract class AbstractServletClient extends HttpServlet {
         // Parse any posted parameters in the input stream
         if (isFormPost) {
             int max = request.getContentLength();
+            if (max > totalUploadLimit * 1024) {
+                throw new IOException("Exceeded Upload limit");
+            }
             int len = 0;
             byte[] buf = new byte[max];
             ServletInputStream is = request.getInputStream();