Re #1564 Fixing the Java exception issue on more like this.