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

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