@@ -78,7 +78,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
 
  * @author JSON.org
- * @version 2010-12-24
+ * @version 2010-12-28
  */
 public class JSONArray {
 
@@ -322,7 +322,8 @@ public long getLong(int index) throws JSONException {
      * @throws JSONException If there is no value for the index.
      */
     public String getString(int index) throws JSONException {
-        return get(index).toString();
+        Object object = get(index);
+        return object == JSONObject.NULL ? null : object.toString();
     }
 
 
 
@@ -87,7 +87,7 @@ of this software and associated documentation files (the "Software"), to deal
  * <li>Numbers may have the <code>0x-</code> <small>(hex)</small> prefix.</li>
  * </ul>
  * @author JSON.org
- * @version 2010-12-24
+ * @version 2010-12-28
  */
 public class JSONObject {
 
@@ -627,10 +627,8 @@ public static String[] getNames(Object object) {
      * @throws   JSONException if the key is not found.
      */
     public String getString(String key) throws JSONException {
-        if(isNull(key)){
-            return null;
-        }
-        return get(key).toString();
+        Object object = get(key);
+        return object == NULL ? null : object.toString();
     }