diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 784d3ef67e822..5adcbcf59063b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10344,9 +10344,11 @@ namespace ts {
 
         function getReturnTypeFromJSDocComment(func: SignatureDeclaration | FunctionDeclaration): Type {
             const returnTag = getJSDocReturnTag(func);
-            if (returnTag) {
+            if (returnTag && returnTag.typeExpression) {
                 return getTypeFromTypeNode(returnTag.typeExpression.type);
             }
+
+            return undefined;
         }
 
         function createPromiseType(promisedType: Type): Type {
diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo7.ts b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts
new file mode 100644
index 0000000000000..5aa8474757d50
--- /dev/null
+++ b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+// @allowNonTsExtensions: true
+// @Filename: file.js
+//// /**
+////  * This is a very cool function that is very nice.
+////  * @returns something
+////  * @param p anotherthing
+////  */
+//// function a1(p) {
+//// 	try {
+//// 		throw new Error('x');
+//// 	} catch (x) { x--; }
+//// 	return 23;
+//// }
+//// 
+//// x - /**/a1()
+
+goTo.marker();
+verify.quickInfoExists();
\ No newline at end of file