Add an error msg if empty message is received (#1424)

Add an error msg if empty message is received (#1424) #1499