- Improved catch behavior.