Fixed NPE when called with empty message