Added more validation logic in Vaults Controller