diff --git a/software-client/software_client/v1/release.py b/software-client/software_client/v1/release.py
index 1120d8af..2019ed8f 100644
--- a/software-client/software_client/v1/release.py
+++ b/software-client/software_client/v1/release.py
@@ -63,7 +63,6 @@ class ReleaseManager(base.Manager):
         return self._fetch(path)
 
     def upload(self, args):
-        rc = 0
 
         # arg.release is a list
         releases = args.release
@@ -92,7 +91,7 @@ class ReleaseManager(base.Manager):
 
         if len(valid_files) == 0:
             print("No file to be uploaded.")
-            return rc
+            return 1
 
         path = '/v1/release'
         if is_local:
diff --git a/software-client/software_client/v1/release_shell.py b/software-client/software_client/v1/release_shell.py
index 6870c176..5e49a241 100644
--- a/software-client/software_client/v1/release_shell.py
+++ b/software-client/software_client/v1/release_shell.py
@@ -191,7 +191,11 @@ def _print_upload_result(resp, data, debug):
            action='store_true')
 def do_upload(cc, args):
     """Upload a software release"""
-    resp, data = cc.release.upload(args)
+    result = cc.release.upload(args)
+    if isinstance(result, int):
+        return result
+    else:
+        resp, data = result[0], result[1]
     _print_upload_result(resp, data, args.debug)
 
     return utils.check_rc(resp, data)