Improved failure handling