Added handling of repository unavailability