Merge r1904938 from trunk: * r1904938 Java binding fixes. Justification: Don't crash if someone uses a null message Votes: +1: dsahlberg, jamessan