2 files changed, 11 insertions, 2 deletions
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index f2e3917..a309658 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -121,8 +121,12 @@ if [ ! -e "$STATE" ]; then
 else
   # Resume from the previous state
   STAGE="`cat $STATE`"
-  source $ENV
-  hydra_system_upgrade_$STATE
+
+  # Restore environment
+  if [ -e "$ENV" ]; then
+    source $ENV
+    hydra_system_upgrade_$STATE
+  fi
 fi
 
 # Prepare
diff --git a/share/hydractl/trac-upgrade b/share/hydractl/trac-upgrade
index 06a6a69..31e8f52 100755
--- a/share/hydractl/trac-upgrade
+++ b/share/hydractl/trac-upgrade
@@ -23,6 +23,11 @@ hydra_config_load
 # Parameters
 BASE="/var/sites"
 
+# Check for sites
+if [ ! -d "$BASE" ]; then
+  exit
+fi
+
 # Upgrade
 for instance in `find $BASE -maxdepth 2 -name trac`; do
   (