Added more thorough check routines for cluster pointers