Fix comments npe