- Improved error catch behavior.