diff --git a/doc/THANKS b/doc/THANKS
index ae112f2a3..869f30511 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -553,6 +553,9 @@ Zhen Zhou <zhouzhenster@gmail.com>
 abc abc <biedimc@gmx.net>
     for reporting a minor bug
 
+Alex m3zero@gmail.com
+    for reporting a minor bug
+
 anonymous anonymous <tmp@2ch.so>
     for reporting a couple of bugs
 
diff --git a/lib/request/basic.py b/lib/request/basic.py
index 3669a8c19..6823a0499 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -135,7 +135,7 @@ def checkCharEncoding(encoding):
     # http://philip.html5.org/data/charsets-2.html
     if encoding in translate:
         encoding = translate[encoding]
-    elif encoding == 'null':
+    elif encoding in ('null', '{charset}'):
         return None
 
     # http://www.iana.org/assignments/character-sets