Skip buildID and try to be more error resilient