diff --git a/Python/ceval.c b/Python/ceval.c
index 05275373cdf..7c358dbd934 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1337,6 +1337,13 @@ eval_code2(co, globals, locals,
 			continue;
 
 		case DELETE_FAST:
+			x = GETLOCAL(oparg);
+			if (x == NULL) {
+				PyErr_SetObject(PyExc_NameError,
+					   PyTuple_GetItem(co->co_varnames,
+							oparg));
+				break;
+			}
 			SETLOCAL(oparg, NULL);
 			continue;