added NPE try/catch to avoid editor deadlock on Review Annotation issues