Index: src/java/org/netbeans/server/componentsmatch/Matcher.java
===================================================================
RCS file: /cvs/logger/uihandlerserver/src/java/org/netbeans/server/componentsmatch/Matcher.java,v
retrieving revision 1.2
diff -u -r1.2 Matcher.java
--- src/java/org/netbeans/server/componentsmatch/Matcher.java	7 Feb 2007 14:55:47 -0000	1.2
+++ src/java/org/netbeans/server/componentsmatch/Matcher.java	28 Feb 2007 17:25:17 -0000
@@ -38,7 +38,8 @@
     static List<Package> allPackages;
 
     static Matcher defaultMatcher;
-    // XXX I am not sure if it is best ide to check netbeans.org prefixes
+    static final String ORG_NETBEANS_MODULES = "org.netbeans.modules";    
+    // XXX I am not sure if it is the best idea to check netbeans.org prefixes
     // it is not applicable to other product (rave, etc)
     static final String[] NB_ORG_PREFIXES = new String[] {
         "org.openide.","org.netbeans.","org.apache.tools.ant.module.","org.openidex."
@@ -85,6 +86,23 @@
             Package pack = getPackage(packageName);
             if (pack != null) {
                 return pack.getFirstComponent();
+            } else {
+                 // try merge other packages
+                 if (checkNetBeansOrgSubPackage(packageName)) {
+                    pack = getPackageMerger().getPackage(packageName);
+                    if (pack != null) {
+                        Component comp = pack.getFirstComponent();
+                        if (comp != null ) {
+                            String cname = comp.getComponent();
+                            String subName = comp.getSubComponent();
+                            if (!((cname.equals("core") || cname.equals("openide")) &&
+                                    subName.equals("code"))) {
+                                return comp;
+                            } 
+                        }
+                    }
+                 } 
+                
             }
         }
         return null;
@@ -97,15 +115,13 @@
              int lastDot = name.lastIndexOf('.');
              if (lastDot != -1) {
                  name = name.substring(0,lastDot);
+                 if (name.equals(ORG_NETBEANS_MODULES)) {
+                     return null;
+                 }
                  pack = getPackage(name);
              }
          }
-         if (pack == null) {
-             // try merge other packages
-             if (checkNetBeansOrgSubPackage(name)) {
-                pack = getPackageMerger().getPackage(name);
-             }
-         }
+  
          return pack;
     }
     
Index: test/org/netbeans/server/componentsmatch/MatcherTest.java
===================================================================
RCS file: /cvs/logger/uihandlerserver/test/org/netbeans/server/componentsmatch/MatcherTest.java,v
retrieving revision 1.2
diff -u -r1.2 MatcherTest.java
--- test/org/netbeans/server/componentsmatch/MatcherTest.java	7 Feb 2007 14:56:29 -0000	1.2
+++ test/org/netbeans/server/componentsmatch/MatcherTest.java	28 Feb 2007 17:25:17 -0000
@@ -74,5 +74,9 @@
         assertEquals("j2ee",comp.getComponent());
         assertEquals("refactoring",comp.getSubComponent());
 
+       comp = matcher.match(new StackTraceElement[] {
+            new StackTraceElement("org.netbeans.modules.reallyunknownmodule.Aaa","getDefault()","file",45)
+        }); 
+        assertNull(comp);
     }
 }