update to analyze :class in :catch/:new