make addComment safe