1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/Ice/OutputStreamI.java b/java/src/Ice/OutputStreamI.java
index 934f8047e85..7cd54936769 100644
--- a/java/src/Ice/OutputStreamI.java
+++ b/java/src/Ice/OutputStreamI.java
@@ -136,6 +136,11 @@ public class OutputStreamI implements OutputStream
     public void
     writeSize(int sz)
     {
+        if(sz < 0)
+        {
+            throw new NegativeSizeException();
+        }
+
         _os.writeSize(sz);
     }
 
@@ -184,7 +189,7 @@ public class OutputStreamI implements OutputStream
     public void
     endEncapsulation()
     {
-        _os.endWriteEncaps();
+        _os.endWriteEncapsChecked();
     }
 
     public void