Extra JSONModel null check
JSONObject small change