Feature/defer exception for certs