PLT-497 Better handling of null

Fix Javadoc
Use Optional
Is this a valid reason, given we check for null message on the line above?