Add check for message existence