diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1e4907ac428..07579aa3837 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2736,6 +2736,8 @@ static PyObject *charmapencode_lookup(Py_UNICODE c, PyObject *mapping)
 	} else
 	    return NULL;
     }
+    else if (x == Py_None)
+	return x;
     else if (PyInt_Check(x)) {
 	long value = PyInt_AS_LONG(x);
 	if (value < 0 || value > 255) {