diff --git a/cmd/cloudinitsave/cloudinitsave.go b/cmd/cloudinitsave/cloudinitsave.go
index 3125e7cb..e7e10bb3 100755
--- a/cmd/cloudinitsave/cloudinitsave.go
+++ b/cmd/cloudinitsave/cloudinitsave.go
@@ -276,6 +276,7 @@ func selectDatasource(sources []datasource.Datasource) datasource.Datasource {
 			for {
 				log.Infof("cloud-init: Checking availability of %q\n", s.Type())
 				if s.IsAvailable() {
+					log.Infof("cloud-init: Datasource GOOD: %s", s)
 					ds <- s
 					return
 				}
diff --git a/config/cloudinit/datasource/url/url.go b/config/cloudinit/datasource/url/url.go
index 7973ebb4..f00fe43a 100755
--- a/config/cloudinit/datasource/url/url.go
+++ b/config/cloudinit/datasource/url/url.go
@@ -45,6 +45,11 @@ func (f *RemoteFile) String() string {
 }
 
 func (f *RemoteFile) AvailabilityChanges() bool {
+	if f.lastError != nil {
+		if _, ok := f.lastError.(pkg.ErrNotFound); ok {
+			return false
+		}
+	}
 	return true
 }