diff --git a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
index 8dcd0e22e9a..735051f07f6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/kdoc/KDocRenderer.kt
@@ -57,7 +57,13 @@ object KDocRenderer {
         to.append("<DT><b>").append("See Also:").append("</b>")
         to.append("<DD>")
         seeTags.forEachIndexed { index, tag ->
-            DocumentationManagerUtil.createHyperlink(to, tag.getSubjectName(), tag.getSubjectName(), false)
+            val subjectName = tag.getSubjectName()
+            if (subjectName != null) {
+                DocumentationManagerUtil.createHyperlink(to, subjectName, subjectName, false)
+            }
+            else {
+                to.append(tag.getContent())
+            }
             if (index < seeTags.size() - 1) {
                 to.append(", ")
             }
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
index 0d608a1bf20..1b05406a617 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
@@ -1,6 +1,7 @@
 /**
  * @see C
  * @see D
+ * @see <a href="http://kotl.in">kotlin</a>
  */
 fun testMethod() {
 
@@ -17,4 +18,4 @@ fun test() {
 }
 
 //INFO: <b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package<br/>
-//INFO: <DD><DL><DT><b>See Also:</b><DD><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a></DD></DL></DD>
+//INFO: <DD><DL><DT><b>See Also:</b><DD><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a>, <a href="http://kotl.in">kotlin</a></DD></DL></DD>