Add fix for gczeal induced failure with additional sanity-checking assert.