added non-json checking