diff --git a/ricecooker/commands.py b/ricecooker/commands.py
index <HASH>..<HASH> 100644
--- a/ricecooker/commands.py
+++ b/ricecooker/commands.py
@@ -41,15 +41,16 @@ def uploadchannel(arguments, **kwargs):
                         **kwargs)
         config.SUSHI_BAR_CLIENT.report_stage('COMPLETED', 0)
     except Exception as e:
-        config.SUSHI_BAR_CLIENT.report_stage('FAILURE', 0)
+        if config.SUSHI_BAR_CLIENT:
+            config.SUSHI_BAR_CLIENT.report_stage('FAILURE', 0)
         config.LOGGER.critical(e)
         raise
     finally:
-        config.SUSHI_BAR_CLIENT.close()
+        if config.SUSHI_BAR_CLIENT:
+            config.SUSHI_BAR_CLIENT.close()
         config.LOGGER.removeHandler(__logging_handler)
 
 
-
 def __uploadchannel(path, verbose=False, update=False, thumbnails=False, download_attempts=3, resume=False, reset=False, step=Status.LAST.name, token="#", prompt=False, publish=False, warnings=False, compress=False, **kwargs):
     """ uploadchannel: Upload channel to Kolibri Studio server
         Args:
Remote control: applying changes lost after rebasing.