Es bad url

I found a few places that check for None. Will fix those and upload