Es service check

Just an FYI, you don't need to pass along the `e` value, you can just do `raise`