diff --git a/setup/functions.sh b/setup/functions.sh
index 46a35fbb..b9591b04 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -255,7 +255,7 @@ function check_config_agreed {
 			return 1
 		fi
 		local current_directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-		local yaml_agreed=$(python check "${current_directory}"/checkagree.py "${STORAGE_ROOT}/settings.yaml")
+		local yaml_agreed=$(python "${current_directory}"/checkagree.py check "${STORAGE_ROOT}/settings.yaml")
 		if [ "$yaml_agreed" -eq "true"]; then
 			return 0
 		fi
@@ -274,8 +274,8 @@ function set_config_agreed {
 	fi
 
 	local current_directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-	local yaml_agreed=$(python set "${current_directory}"/checkagree.py "${STORAGE_ROOT}settings.yaml")
-	if [ "$yaml_agreed" == "true"]; then
+	local yaml_agreed=$(python "${current_directory}"/checkagree.py set "${STORAGE_ROOT}settings.yaml"; echo $?)
+	if [ "$yaml_agreed" == "true" ]; then
 		return 0
 	fi
 	return 1