Fix import pattern for exceptions. Performance optimization for correlation.