diff -r 4e2a1b656c1f Modules/faulthandler.c
--- a/Modules/faulthandler.c	Fri Sep 06 19:58:01 2013 -0700
+++ b/Modules/faulthandler.c	Sat Sep 07 18:08:59 2013 +0800
@@ -1048,8 +1048,9 @@
 {
     PyObject *xoptions, *key, *module, *res;
     _Py_IDENTIFIER(enable);
+    char *p;
 
-    if (!Py_GETENV("PYTHONFAULTHANDLER")) {
+    if (!((p = Py_GETENV("PYTHONFAULTHANDLER")) && *p != '\0')) {
         int has_key;
 
         xoptions = PySys_GetXOptions();