diff --git a/quack.sh b/quack.sh
index 3fbea8b1b5e34754a7e98b67f54862d0d05d0e0e..cd56637c290beb4a4c6032f87ab05765cdb0290f 100755
--- a/quack.sh
+++ b/quack.sh
@@ -83,9 +83,9 @@ if [ -e "quack.settings" ]; then
     echo "Sourcing settings from quack.settings"
     source "quack.settings"
 fi
-PRESENTATION_SCRIPT="$ROOT/presentation.sh"
 popd > /dev/null
 
+PRESENTATION_SCRIPT="$ROOT/presentation.sh"
 FOLDER_TEMPLATE="$ROOT/folder_template.html"
 IMAGE_TEMPLATE="$ROOT/image_template.html"
 DRAGON="openseadragon.min.js"
@@ -102,7 +102,7 @@ if [ "." == ".$SOURCE" ]; then
     echo "Error: Missing source" >&2
     echo ""
     usage
-    exit
+    exit 2
 fi
 pushd $SOURCE > /dev/null
 SOURCE_FULL=`pwd`
@@ -113,7 +113,7 @@ if [ "." == ".$DEST" ]; then
     echo "Error: Missing destination" >&2
     echo ""
     usage
-    exit
+    exit 2
 fi
 if [ ! -f "$ROOT/$DRAGON" ]; then
     echo "The file $ROOT/$DRAGON does not exist" >&2