Updating for None returned to JSON (not sure what's causing it yet)