diff --git a/client/src/docker/docker.bash b/client/src/docker/docker.bash
index 2e94b16..7bfd087 100755
--- a/client/src/docker/docker.bash
+++ b/client/src/docker/docker.bash
@@ -2,7 +2,7 @@
 
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ function main()
 
   <platform/user:tag>
 
-    platform    \e[34;3mBase image platform (default: archlinux)\e[0m
+    platform    \e[34;3mBase image platform (archlinux | ubuntu | dev-tools)\e[0m
     user        \e[34;3mUser to bind-mount with (default: ${USER})\e[0m
     tag         \e[34;3mImage tag type to use (default: latest)\e[0m
 
@@ -167,7 +167,7 @@ function main()
   # Command facade
   #
 
-  [ -z "$global_command" ] && lib_utils::die_fatal
+  # shellcheck disable=SC2154
   case "$global_command" in
     gen)
       lib_docker::gen "${@:3}"
diff --git a/client/src/docker/lib/internal/lib_env.bash b/client/src/docker/lib/internal/lib_env.bash
index e957cf7..9b085ea 100644
--- a/client/src/docker/lib/internal/lib_env.bash
+++ b/client/src/docker/lib/internal/lib_env.bash
@@ -2,7 +2,7 @@
 
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -120,12 +120,10 @@ function lib_env::env()
       lib_env::__write "$_env_file"
     fi
   else
-    [ -z "$global_command" ] && lib_utils::die_fatal
-    [ -z "$global_basename" ] && lib_utils::die_fatal
-
-    if [[ -z "$global_command" || "$global_command" != "gen" ]]; then
+    # shellcheck disable=SC2154
+    if [ "$global_command" != "gen" ]; then
       lib_utils::die_fatal \
-        "Client environment not found! Run gen command'"
+        "Client environment not found! Run 'gen' command"
     fi
 
     lib_utils::print_info \
diff --git a/client/src/docker/lib/lib_docker.bash b/client/src/docker/lib/lib_docker.bash
index 1f1fb0f..dc11495 100644
--- a/client/src/docker/lib/lib_docker.bash
+++ b/client/src/docker/lib/lib_docker.bash
@@ -2,7 +2,7 @@
 
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,11 +78,11 @@ function lib_docker::docker()
   IFS="/" read -ra _image <<<"$1"
   declare -gx global_platform="${_image[0]}"
   local -r _user="${_image[1]}"
+  [ -z "$_user" ] && lib_utils::die_fatal "User not given for '${_image[*]}'"
   lib_utils::print_debug "global_platform=${global_platform}"
 
   if [[ ! "$global_platform" =~ ^archlinux$|^ubuntu$|^dev-tools$ ]]; then
-    lib_utils::print_warning "unsupported platform '${global_platform}', defaulting to Arch Linux"
-    global_platform="archlinux"
+    lib_utils::die_fatal "Unsupported platform '${global_platform}'"
   fi
 
   # Parse tag