diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6f3b94e0b40..5d14270ec8f 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -25571,7 +25571,7 @@ namespace ts {
         function checkNonNullNonVoidType(type: Type, node: Node): Type {
             const nonNullType = checkNonNullType(type, node);
             if (nonNullType !== errorType && nonNullType.flags & TypeFlags.Void) {
-                error(node, Diagnostics.Object_is_possibly_undefined);
+                error(node, Diagnostics.Object_is_possibly_void);
             }
             return nonNullType;
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index cab3de0e1ba..7b06f293f22 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -3059,6 +3059,11 @@
         "category": "Error",
         "code": 2796
     },
+    "Object is possibly 'void'.": {
+        "category": "Error",
+        "code": 2797
+    },
+
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",