[BUG FIX]Consider when no message