Fix to catch JSON parsing when not needed