diff --git a/scripts/base.sh b/scripts/base.sh
index 47c2ec6..84c1740 100644
--- a/scripts/base.sh
+++ b/scripts/base.sh
@@ -37,10 +37,10 @@ declare -a BACKUP_LIST=("$HOME/.ssh/" \
     echo
     echo "${COLOR_YELLOW}The"
     base64 -d <<<"ICBfX19fXyAgICAgICAgICAgICAgICBfX19fXyAgICAgICAgICAgXyAgICAgICAgICAgICAgICAgCiAvIF9fX198ICAgICAgICAgICAgICAvIF9fX198ICAgICAgICAgfCB8ICAgICAgICAgICAgICAgIAp8IHwgICAgIF9fXyAgXyBfXyBfX198IChfX18gIF8gICBfIF9fX3wgfF8gX19fIF8gX18gX19fICAKfCB8ICAgIC8gXyBcfCAnX18vIF8gXFxfX18gXHwgfCB8IC8gX198IF9fLyBfIFwgJ18gYCBfIFwgCnwgfF9fX3wgKF8pIHwgfCB8ICBfXy9fX19fKSB8IHxffCBcX18gXCB8fCAgX18vIHwgfCB8IHwgfAogXF9fX19fXF9fXy98X3wgIFxfX198X19fX18vIFxfXywgfF9fXy9cX19cX19ffF98IHxffCB8X3wKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX18vIHwgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfF9fXy8gICAgICAgICAgICAgICAgICAgICAgIAo="
-    echo "is administration tool designed from and for Kevin Veen-Birkenbach."
+    echo "is an administration tool designed from and for Kevin Veen-Birkenbach."
     echo
     echo "Licensed under GNU GENERAL PUBLIC LICENSE Version 3"
     echo "${COLOR_RESET}"
   }
-  
+
   HEADER
diff --git a/scripts/client/setup.sh b/scripts/client/setup.sh
index f87d257..9b66642 100644
--- a/scripts/client/setup.sh
+++ b/scripts/client/setup.sh
@@ -4,7 +4,7 @@
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 #
 # shellcheck source=/dev/null # Deactivate SC1090
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 SYSTEM_MEMORY_KB="$(grep MemTotal /proc/meminfo | awk '{print $2}')"
 echo "Start setup of customized core software..."
 echo "Copying templates to home folder..."
diff --git a/scripts/data/data-backup.sh b/scripts/data/data-backup.sh
index 13ce94d..4bbe5bc 100644
--- a/scripts/data/data-backup.sh
+++ b/scripts/data/data-backup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Executes all scripts which are necessary to backup data
 # @author Kevin Veen-Birkenbach [aka. Frantz]
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 bash "$SCRIPT_PATH/import-data-from-system.sh"
 bash "$SCRIPT_PATH/push-local-repositories.sh"
diff --git a/scripts/data/export-to-system.sh b/scripts/data/export-to-system.sh
index 0b00d4b..caf3b45 100644
--- a/scripts/data/export-to-system.sh
+++ b/scripts/data/export-to-system.sh
@@ -2,5 +2,5 @@
 # Executes the import script in reverse mode
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 # shellcheck source=/dev/null # Deactivate SC1090
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 bash "$SCRIPT_PATH/import-data-from-system.sh" reverse
diff --git a/scripts/data/import-from-system.sh b/scripts/data/import-from-system.sh
index 4a79439..8ea0900 100644
--- a/scripts/data/import-from-system.sh
+++ b/scripts/data/import-from-system.sh
@@ -6,7 +6,7 @@
 #
 # shellcheck source=/dev/null # Deactivate SC1090
 # shellcheck disable=SC2143  # Comparing with -z allowed
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 if [ -z "$(mount | grep "$DECRYPTED_PATH")" ]
   then
     echo "The decrypted folder $DECRYPTED_PATH is locked. You need to unlock it!"
diff --git a/scripts/encryption/lock.sh b/scripts/encryption/lock.sh
index b1260cd..7718d8a 100644
--- a/scripts/encryption/lock.sh
+++ b/scripts/encryption/lock.sh
@@ -4,6 +4,6 @@
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 #
 # shellcheck source=/dev/null # Deactivate SC1090
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 echo "Locking directory $DECRYPTED_PATH..."
 fusermount -u "$DECRYPTED_PATH" && echo "Data is now encrypted." && echo "Removing directory $DECRYPTED_PATH..." && rmdir "$DECRYPTED_PATH"
diff --git a/scripts/encryption/unlock.sh b/scripts/encryption/unlock.sh
index e0f7133..3412c79 100644
--- a/scripts/encryption/unlock.sh
+++ b/scripts/encryption/unlock.sh
@@ -4,7 +4,7 @@
 # @author Kevin Veen-Birkenbach [aka. Frantz]
 #
 # shellcheck source=/dev/null # Deactivate SC1090
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 echo "Unlocking directory $DECRYPTED_PATH..."
 if [ ! -d "$DECRYPTED_PATH" ]
   then
diff --git a/scripts/repositories/pull.sh b/scripts/repositories/pull.sh
index 6958b30..cd86138 100644
--- a/scripts/repositories/pull.sh
+++ b/scripts/repositories/pull.sh
@@ -2,5 +2,5 @@
 #
 # Pushs all repositories
 # @author Kevin Veen-Birkenbach [aka. Frantz]
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 bash "$SCRIPT_PATH/push-local-repositories.sh" push
diff --git a/scripts/repositories/push.sh b/scripts/repositories/push.sh
index 02faada..97a5a7c 100644
--- a/scripts/repositories/push.sh
+++ b/scripts/repositories/push.sh
@@ -3,7 +3,7 @@
 # Pushs all repositories
 # @param $1 git command which should be executed instead of default pull
 # @author Kevin Veen-Birkenbach [aka. Frantz]
-source "$(dirname "$(readlink -f "${0}")")/base.sh"
+source "$(dirname "$(readlink -f "${0}")")/base.sh" || echo "Loading base.sh failed." && exit 1
 if [ $# -eq 1 ]
   then
     git_command=$1