Added validation on messaging to avoid empty messages