Additional 500/ISE response handling for production