diff --git a/JDK-8282944.patch b/JDK-8282944.patch
index 03250a2..0242cac 100644
--- a/JDK-8282944.patch
+++ b/JDK-8282944.patch
@@ -1,6 +1,14 @@
 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
 +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
-@@ -1015,6 +1015,10 @@ public class HtmlDocletWriter {
+@@ -36,6 +36,7 @@ import java.util.ListIterator;
+ import java.util.Locale;
+ import java.util.Map;
+ import java.util.Objects;
++import java.util.Optional;
+ import java.util.Set;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+@@ -1015,6 +1016,10 @@ public class HtmlDocletWriter {
                          // @see reference label...
                          label = ref.subList(1, ref.size());
                      }
@@ -11,3 +19,69 @@
                      default ->
                          throw new IllegalStateException(ref.get(0).getKind().toString());
                  }
+--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java
++++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java
+@@ -23,15 +23,19 @@
+ 
+ /*
+  * @test
+- * @bug      8017191 8182765 8200432 8239804 8250766 8262992
++ * @bug      8017191 8182765 8200432 8239804 8250766 8262992 8281944
+  * @summary  Javadoc is confused by at-link to imported classes outside of the set of generated packages
+- * @library  ../../lib
++ * @library  /tools/lib ../../lib
+  * @modules jdk.javadoc/jdk.javadoc.internal.tool
+- * @build    javadoc.tester.*
++ * @build    toolbox.ToolBox javadoc.tester.*
+  * @run main TestSeeTag
+  */
+ 
+ import javadoc.tester.JavadocTester;
++import toolbox.ToolBox;
++
++import java.io.IOException;
++import java.nio.file.Path;
+ 
+ public class TestSeeTag extends JavadocTester {
+ 
+@@ -105,4 +109,40 @@ public class TestSeeTag extends JavadocTester {
+                     </dd>
+                     </dl>""");
+     }
++
++    ToolBox tb = new ToolBox();
++
++    @Test
++    public void testErroneous() throws IOException {
++        Path src = Path.of("erroneous", "src");
++        tb.writeJavaFiles(src, """
++                package erroneous;
++                /**
++                 * Comment.
++                 * @see <a href="
++                 */
++                public class C {
++                    private C() { }
++                }
++                """);
++
++        javadoc("-d", Path.of("erroneous", "api").toString(),
++                "-sourcepath", src.toString(),
++                "--no-platform-links",
++                "erroneous");
++        checkExit(Exit.ERROR);
++
++        checkOutput("erroneous/C.html", true,
++                """
++                    <dl class="notes">
++                    <dt>See Also:</dt>
++                    <dd>
++                    <ul class="see-list">
++                    <li><span class="invalid-tag">invalid input: '&lt;a href="'</span></li>
++                    </ul>
++                    </dd>
++                    </dl>
++                    """);
++
++    }
+ }