Tweaking error handling.