--- JSON-XS/XS.xs	2007/07/10 15:45:34	1.53
+++ JSON-XS/XS.xs	2007/07/23 22:57:40	1.55
@@ -308,8 +308,14 @@
 
   for (i = 0; i <= len; ++i)
     {
+      SV **svp = av_fetch (av, i, 0);
+
       encode_indent (enc);
-      encode_sv (enc, *av_fetch (av, i, 0));
+
+      if (svp)
+        encode_sv (enc, *svp);
+      else
+        encode_str (enc, "null", 4, 0);
 
       if (i < len)
         encode_comma (enc);
@@ -495,15 +501,15 @@
 
               if (to_json)
                 {
+                  int count;
                   dSP;
 
                   ENTER; SAVETMPS; PUSHMARK (SP);
                   XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
 
                   // calling with G_SCALAR ensures that we always get a 1 return value
-                  // check anyways.
                   PUTBACK;
-                  assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
+                  call_sv ((SV *)GvCV (to_json), G_SCALAR);
                   SPAGAIN;
 
                   // catch this surprisingly common error