Fix broken test

I broke a test changing the way we handle JSON. This fixes it.
Make sure we return nil if the API 404s