Fixes possible NPE#160

stleary merged 2 commits intostleary:masterstleary/JSON-java:masterfrom

johnjaylward:FixXMLNPEjohnjaylward/JSON-java:FixXMLNPECopy head branch name to clipboard