Improved exception handler for list based scans