Added Check to Prevent empty messages