closing BR #57 - handle empty messages properly