diff --git a/pkgs/kat-gpg-status/kat-gpg-status.sh b/pkgs/kat-gpg-status/kat-gpg-status.sh
index b05fdcbb..2eb7fe8d 100644
--- a/pkgs/kat-gpg-status/kat-gpg-status.sh
+++ b/pkgs/kat-gpg-status/kat-gpg-status.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
+set -eu
+set -o pipefail
 
-gpg --card-status &> /dev/null;
-if [ $? -eq 0 ] || [ $? -eq 2 ]; then
+if gpg --card-status &> /dev/null; then
 	user=" $(gpg --card-status | grep 'Login data' | awk '{print $NF}')";
 else
 	user=" Disconnected"