diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
index 0cf397d796..bffb2c94bf 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
@@ -323,7 +323,10 @@ class I2PSessionImpl2 extends I2PSessionImpl {
             try {
                 return DataHelper.decompress(compressed);
             } catch (IOException ioe) {
-                throw new I2PSessionException("Error decompressing message", ioe);
+                //throw new I2PSessionException("Error decompressing message", ioe);
+                if (_log.shouldWarn())
+                    _log.warn("Error decompressing message", ioe);
+                return null;
             }
         }
         return compressed;
diff --git a/history.txt b/history.txt
index 2d839c08dd..f331c7aebf 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
 2017-02-15 zzz
+ * Build: Fix calls to Class.newInstance() deprecated in Java 9
+ * I2CP: Return null on decompression failure instead of
+   throwing exception (ticket #1915)
  * Utils: Disable caching of ResettableGZIPOutputStreams,
    add more checks for compression failure,
    fix output for zero-length input (ticket #1915)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index fecba78d69..a6204817e3 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";