diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java
index a2368b34b..f27a3bef3 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java
@@ -237,6 +237,8 @@ public ArrayList<AbstractAnnotationComponent> getAnnotationComponents() {
     public AnnotationComponent getComponentFor(Annotation annot) {
         if (annotationToComponent == null) {
             initializeAnnotationsComponent(getPage());
+        }
+        if (annotationToComponent != null) {
             return annotationToComponent.get(annot.getPObjectReference());
         }
         return null;