Issue #332: @Tolstyak's failed download handling