--- a/dmd/Module.d	Mon Aug 30 23:08:44 2010 +0200
+++ b/dmd/Module.d	Tue Aug 31 02:12:15 2010 +0200
@@ -401,35 +401,37 @@
     
     override void toJsonBuffer(OutBuffer buf)
     {
-    	buf.writestring("{\n");
+		buf.writestring("{\n");
 
-    	JsonProperty(buf, Pname, md.toChars());
+		if (md)
+			JsonProperty(buf, Pname, md.toChars());
 
-    	JsonProperty(buf, Pkind, kind());
+		JsonProperty(buf, Pkind, kind());
 
-    	JsonProperty(buf, Pfile, srcfile.toChars());
+		JsonProperty(buf, Pfile, srcfile.toChars());
 
-    	if (comment)
-    		JsonProperty(buf, Pcomment, comment);
+		if (comment)
+			JsonProperty(buf, Pcomment, comment);
 
-    	JsonString(buf, Pmembers);
-    	buf.writestring(" : [\n");
+		JsonString(buf, Pmembers);
+		buf.writestring(" : [\n");
 
-    	size_t offset = buf.offset;
-    	foreach (Dsymbol s; members)
-    	{
-	    	if (offset != buf.offset)
-	    	{
-	    		buf.writestring(",");
-	    		offset = buf.offset;
-	    	}
-	    	s.toJsonBuffer(buf);
-    	}
+		size_t offset = buf.offset;
+		foreach (Dsymbol s; members)
+		{
+			if (offset != buf.offset)
+			{
+				buf.writestring(",\n");
+				offset = buf.offset;
+			}
+			s.toJsonBuffer(buf);
+		}
 
-    	buf.writestring("]\n");
+		JsonRemoveComma(buf);
+		buf.writestring("]\n");
 
-    	buf.writestring("}\n");
-    }
+		buf.writestring("}\n");
+	}
 	
     override string kind()
 	{
@@ -1227,6 +1229,7 @@
 	 */
     bool needModuleInfo()
 	{
+    	// writef("needModuleInfo() %s, %d, %d\n", toChars(), needmoduleinfo, global.params.cov);
 		return needmoduleinfo || global.params.cov;
 	}