fixes for file comments

- prevent possible NPE
- remove gutter icon after removing comment