Added error handling to reduce 404s from jenkins