diff --git a/debian/bootstrap b/debian/bootstrap
index 8096a37..73e1e26 100755
--- a/debian/bootstrap
+++ b/debian/bootstrap
@@ -10,7 +10,7 @@ source /etc/os-release
 if [[ "$ID" != "debian" ]]
 then
     echo "Not running Debian, exiting."
-    exit 1
+    return 1
 fi
 
 # Create an ssh key
@@ -51,3 +51,5 @@ source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/m
 
 # Add user to groups
 source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/generic/add-user-to-groups)
+
+echo "Bootstrap complete! You may need to log out and back in for group membership changes to take effect."
diff --git a/debian/install-makemkv b/debian/install-makemkv
index a8f75f6..7ef9ac9 100755
--- a/debian/install-makemkv
+++ b/debian/install-makemkv
@@ -2,19 +2,19 @@
 # source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/ubuntu/install-makemkv)
 
 # Install makemkv
-if ! type makemkv
+if ! command -v makemkv &>/dev/null
 then
     MAKEMKV_VERSION="1.18.2"
     mkdir -p /tmp/makemkv-build
-    pushd /tmp/makemkv-build || return 1
+    pushd /tmp/makemkv-build || { echo "ERROR: Failed to enter /tmp/makemkv-build"; return 1; }
 
     curl -O "https://www.makemkv.com/download/makemkv-bin-$MAKEMKV_VERSION.tar.gz"
     curl -O "https://www.makemkv.com/download/makemkv-oss-$MAKEMKV_VERSION.tar.gz"
     curl -O https://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
 
-    tar xzvf "makemkv-bin-$MAKEMKV_VERSION.tar.gz"
-    tar xzvf "makemkv-oss-$MAKEMKV_VERSION.tar.gz"
-    tar xjvf ffmpeg-snapshot.tar.bz2
+    tar xzvf "makemkv-bin-$MAKEMKV_VERSION.tar.gz" || { echo "ERROR: Failed to extract makemkv-bin"; popd; return 1; }
+    tar xzvf "makemkv-oss-$MAKEMKV_VERSION.tar.gz" || { echo "ERROR: Failed to extract makemkv-oss"; popd; return 1; }
+    tar xjvf ffmpeg-snapshot.tar.bz2 || { echo "ERROR: Failed to extract ffmpeg snapshot"; popd; return 1; }
 
     popd || return 1
 
@@ -32,18 +32,18 @@ then
     libfdk-aac-dev \
     nasm
 
-    pushd /tmp/makemkv-build/ffmpeg || return 1
+    pushd /tmp/makemkv-build/ffmpeg || { echo "ERROR: Failed to enter ffmpeg directory. Did the ffmpeg snapshot extract correctly?"; return 1; }
     ./configure --prefix=/tmp/ffmpeg --enable-static --disable-shared --enable-pic --enable-libfdk-aac
     make install
     popd || return 1
 
-    pushd "/tmp/makemkv-build/makemkv-oss-$MAKEMKV_VERSION" || return 1
+    pushd "/tmp/makemkv-build/makemkv-oss-$MAKEMKV_VERSION" || { echo "ERROR: Failed to enter makemkv-oss directory"; return 1; }
     PKG_CONFIG_PATH=/tmp/ffmpeg/lib/pkgconfig ./configure
     make
     sudo make install
     popd || return 1
 
-    pushd "/tmp/makemkv-build/makemkv-bin-$MAKEMKV_VERSION" || return 1
+    pushd "/tmp/makemkv-build/makemkv-bin-$MAKEMKV_VERSION" || { echo "ERROR: Failed to enter makemkv-bin directory"; return 1; }
     make
     sudo make install
     popd || return 1
diff --git a/generic/install-jetbrains-tools b/generic/install-jetbrains-tools
index c73d383..9d5c325 100755
--- a/generic/install-jetbrains-tools
+++ b/generic/install-jetbrains-tools
@@ -14,7 +14,7 @@ if [ -f "/tmp/$base_filename/bin/jetbrains-toolbox" ]; then
     echo "JetBrains Toolbox downloaded and extracted successfully."
 else
     echo "Failed to download or extract JetBrains Toolbox."
-    exit 1
+    return 1
 fi
 "/tmp/$base_filename/bin/jetbrains-toolbox" >/dev/null 2>&1 &
 echo "JetBrains Toolbox installation initiated. Please complete the setup through the application interface."