Add checks to make sure credential is valid at cluster interface