diff --git a/stdlib/2/inspect.pyi b/stdlib/2/inspect.pyi
index a7ad5029c..4e157dca7 100644
--- a/stdlib/2/inspect.pyi
+++ b/stdlib/2/inspect.pyi
@@ -109,12 +109,12 @@ Traceback = NamedTuple(
         ('filename', str),
         ('lineno', int),
         ('function', str),
-        ('code_context', List[str]),
-        ('index', int),
+        ('code_context', Optional[List[str]]),
+        ('index', Optional[int]),
     ]
 )
 
-_FrameInfo = Tuple[FrameType, str, int, str, List[str], int]
+_FrameInfo = Tuple[FrameType, str, int, str, Optional[List[str]], Optional[int]]
 
 def getouterframes(frame: FrameType, context: int = ...) -> List[_FrameInfo]: ...
 def getframeinfo(frame: Union[FrameType, TracebackType], context: int = ...) -> Traceback: ...
diff --git a/stdlib/3/inspect.pyi b/stdlib/3/inspect.pyi
index 737b22896..cd3ae9364 100644
--- a/stdlib/3/inspect.pyi
+++ b/stdlib/3/inspect.pyi
@@ -258,8 +258,8 @@ Traceback = NamedTuple(
         ('filename', str),
         ('lineno', int),
         ('function', str),
-        ('code_context', List[str]),
-        ('index', int),
+        ('code_context', Optional[List[str]]),
+        ('index', Optional[int]),
     ]
 )
 
@@ -268,8 +268,8 @@ FrameInfo = NamedTuple('FrameInfo', [('frame', FrameType),
                                      ('filename', str),
                                      ('lineno', int),
                                      ('function', str),
-                                     ('code_context', List[str]),
-                                     ('index', int),
+                                     ('code_context', Optional[List[str]]),
+                                     ('index', Optional[int]),
                                      ])
 
 def getframeinfo(frame: Union[FrameType, TracebackType], context: int = ...) -> Traceback: ...