--- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java	
+++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java	
@@ -216,7 +216,7 @@ 
                 Mercurial.LOG.log(Level.FINE, "null cached status for: {0} {1} {2}", new Object[] {file, folderToScan, parentFile});
                 folderToScan = parentFile;
                 reScheduleScan(1000);
-                continue;
+                info = new FileInformation(FileInformation.STATUS_VERSIONED_UPTODATE, false);
             }
             int status = info.getStatus();
             if ((status & includeStatus) == 0) continue;
@@ -447,6 +447,7 @@ 
         String binaryString = "";       // NOI18N
 
         if (needRevisionForFormat) {
+            if ((status & FileInformation.STATUS_NOTVERSIONED_EXCLUDED) == 0) {
             try {
                 File repository = Mercurial.getInstance().getTopmostManagedParent(file);
                 String revStr = HgCommand.getLastRevision(repository, file);
@@ -458,8 +459,8 @@ 
                 DialogDisplayer.getDefault().notifyLater(e);
             }
         }
+        }
 
-
         //String stickyString = SvnUtils.getCopy(file);
         String stickyString = null;
         if (stickyString == null) {