Add some extra checks to see if certs exists