diff --git a/iguana/pnacl/Release/iguana.pexe b/iguana/pnacl/Release/iguana.pexe
index cf79bb105..04d879de6 100644
Binary files a/iguana/pnacl/Release/iguana.pexe and b/iguana/pnacl/Release/iguana.pexe differ
diff --git a/pnacl_main.h b/pnacl_main.h
index d036eec4f..7af7fa30b 100644
--- a/pnacl_main.h
+++ b/pnacl_main.h
@@ -620,7 +620,9 @@ int CHROMEAPP_HANDLER(struct PP_Var params,struct PP_Var *output,const char **ou
     PNACL_message("inside Handle_%s\n",CHROMEAPP_STR);
     CHECK_PARAM_COUNT(CHROMEAPP_STR, 1);
     PARAM_STRING(0,jsonstr);
-    if ( (retstr= CHROMEAPP_JSON(jsonstr)) == 0 )
+    if ( jsonstr == 0 )
+        retstr = clonestr("{\"error\":\"illegal null jsonstr received\"}");
+    else if ( (retstr= CHROMEAPP_JSON(jsonstr)) == 0 )
         retstr = clonestr("{\"error\":\"null return\"}");
     CREATE_RESPONSE(CHROMEAPP_STR);
     RESPONSE_STRING(retstr);