Fixing null JSON
... A LITTLE smarter