--- a/rakelib/workflow.rake	Tue Dec 13 22:06:34 2016 +0000
+++ b/rakelib/workflow.rake	Tue Dec 13 22:48:25 2016 +0000
@@ -22,7 +22,21 @@
       opts = {
         :user => user,
         :pass => pass,
-      }                  
+      }   
+      paths = hg.paths
+      if remote == 'upstream' 
+        if not paths['upstream'] then
+          remote = 'canonical'
+        end
+      elsif remote == 'staging'
+        if not paths['staging'] then
+          puts ""
+          puts "!! repository #{hg.path} has not staging repository defined - skipping !!"
+          puts ""  
+          return
+        end
+      end
+      
       if review_only then
         opts[:rev] = '.'
         remote_url = hg.paths[remote] || remote