Support for more exceptions found in production