fixed bug on empty comment and nil