Added check for if there are no comments