diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b5c477068a4..b2b34d7aec1 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -9609,7 +9609,13 @@ namespace ts {
                 if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
                     if (accessNode && everyType(objectType, t => !(<TupleTypeReference>t).target.hasRestElement)) {
                         const indexNode = getIndexNodeForAccessExpression(accessNode);
-                        error(indexNode, Diagnostics.Property_0_does_not_exist_on_type_1, unescapeLeadingUnderscores(propName), typeToString(objectType));
+                        if (isTupleType(objectType)) {
+                            error(indexNode, Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2,
+                                typeToString(objectType), getTypeReferenceArity(objectType), unescapeLeadingUnderscores(propName));
+                        }
+                        else {
+                            error(indexNode, Diagnostics.Property_0_does_not_exist_on_type_1, unescapeLeadingUnderscores(propName), typeToString(objectType));
+                        }
                     }
                     return mapType(objectType, t => getRestTypeOfTupleType(<TupleTypeReference>t) || undefinedType);
                 }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 73ae0b69022..94142196614 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1752,6 +1752,10 @@
         "category": "Error",
         "code": 2492
     },
+    "Tuple type '{0}' of length '{1}' has no element at index '{2}'.": {
+        "category": "Error",
+        "code": 2493
+    },
     "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher.": {
         "category": "Error",
         "code": 2494