--- a/make/netbeans/nb-javac/nbproject/build-impl.xml	
+++ a/make/netbeans/nb-javac/nbproject/build-impl.xml	
@@ -170,7 +170,12 @@ 
         </condition>
         <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <length length="0" string="${endorsed.classpath}" when="greater"/>
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
         </condition>
         <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
             <isset property="profile.available"/>
@@ -827,7 +832,7 @@ 
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
                 <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}"/>
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
                         <customize/>
@@ -839,7 +844,7 @@ 
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
     </target>
--- a/make/netbeans/nb-javac/nbproject/genfiles.properties	
+++ a/make/netbeans/nb-javac/nbproject/genfiles.properties	
@@ -4,5 +4,5 @@ 
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=0dbef76c
-nbproject/build-impl.xml.script.CRC32=5523c4db
-nbproject/build-impl.xml.stylesheet.CRC32=cdba79fa@1.68.0.46
+nbproject/build-impl.xml.script.CRC32=732cb6b1
+nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.0.46
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	
+++ a/src/share/classes/com/sun/tools/javac/comp/Flow.java	
@@ -1127,7 +1127,8 @@ 
                         ctypes = ctypes.append(exc);
                         if (types.isSameType(exc, syms.objectType))
                             continue;
-                        checkCaughtType(l.head.pos(), exc, thrownInTry, caughtInTry);
+                        checkCaughtType(subClauses.size() > 1 ? ct.pos() : l.head.pos(), 
+                                exc, thrownInTry, caughtInTry);
                         caughtInTry = chk.incl(exc, caughtInTry);
                     }
                 }