Changed all commets to block and added explict returns
Fixed infinite loop when loading XXX.json containing an empty array