Error handling adjustments