Fix docstring formatting and add safe check for empty message content

Fix docstring formatting and add safe check for empty message content #2174