Added more exceptions for new data