Add some extra checks and balances, partly to fix NPE on cluster delete