diff --git a/cmd/spconfig/export.go b/cmd/spconfig/export.go
index c6481b3..5c88e69 100644
--- a/cmd/spconfig/export.go
+++ b/cmd/spconfig/export.go
@@ -60,7 +60,10 @@ func newExportCommand() *cobra.Command {
 
 			if wait {
 				log.Warn("Waiting for export task to complete")
-				spconfig.DownloadExport(*apiClient, job.JobId, "spconfig-export-"+job.JobId+".json", folderPath)
+				downloadErr := spconfig.DownloadExport(*apiClient, job.JobId, "spconfig-export-"+job.JobId, folderPath)
+				if downloadErr != nil {
+					return downloadErr
+				}
 			}
 
 			return nil
diff --git a/cmd/spconfig/import.go b/cmd/spconfig/import.go
index 3033c60..b48c815 100644
--- a/cmd/spconfig/import.go
+++ b/cmd/spconfig/import.go
@@ -47,7 +47,10 @@ func newImportCommand() *cobra.Command {
 
 			if wait {
 				log.Warn("Waiting for import task to complete")
-				spconfig.DownloadImport(*apiClient, job.JobId, "spconfig-import-"+job.JobId+".json", folderPath)
+				downloadErr := spconfig.DownloadImport(*apiClient, job.JobId, "spconfig-import-"+job.JobId, folderPath)
+				if downloadErr != nil {
+					return downloadErr
+				}
 			}
 
 			return nil