package org.bouncycastle.bcpg;

import java.io.*;
import java.math.BigInteger;

/**
 * a multiple precision integer
 */
public class MPInteger 
    extends BCPGObject
{
    BigInteger    value = null;
    
    public MPInteger(
        BCPGInputStream    in)
        throws IOException
    {
        int       length = (in.read() << 8) | in.read();
        byte[]    bytes = new byte[(length + 7) / 8];
        
        in.readFully(bytes);
        
        value = new BigInteger(1, bytes);
    }
    
    public MPInteger(
        BigInteger    value)
    {
        this.value = value;
    }
    
    public BigInteger getValue()
    {
        return value;
    }
    
    public void encode(
        BCPGOutputStream    out)
        throws IOException
    {
        int length = value.bitLength();
        
        out.write(length >> 8);
        out.write(length);
        
        byte[]    bytes = value.toByteArray();
        
        if (bytes[0] == 0)
        {
            out.write(bytes, 1, bytes.length - 1);
        }
        else
        {
            out.write(bytes, 0, bytes.length);
        }
    }
}

@@ -545,32 +545,189 @@
    value)%0A    %7B%0A
+        if (value == null %7C%7C value.signum() %3C 0)%0A        %7B%0A            throw new IllegalArgumentException(%22value must not be null, or negative%22);%0A        %7D%0A%0A
         this.val

Add a check that the BigInteger value is not null or negative