diff --git a/dracut/95fido2luks/module-setup.sh b/dracut/95fido2luks/module-setup.sh
index d4a60d0..b8abfa7 100755
--- a/dracut/95fido2luks/module-setup.sh
+++ b/dracut/95fido2luks/module-setup.sh
@@ -18,7 +18,7 @@ mirror() {
 }
 
 install () {
-        set -e
+        set -ex
         bash -n "$moddir/generator.sh"
         local tmp=$(mktemp -d -t dracut-fido2luks-XXX)
         trap "rm -rf $tmp" EXIT
@@ -27,15 +27,15 @@ install () {
         inst "$moddir/generator.sh" "$systemdutildir/system-generators/fido2luks-generator.sh"
         mirror "/usr/bin/fido2luks"
         mirror "/etc/fido2luks.conf"
-        for config in /etc/fido2luks.conf.d/*;  do
+        [ -d /etc/fido2luks.conf.d ] && for config in /etc/fido2luks.conf.d/*;  do
           mirror "$config"
         done
         inst "$systemdutildir/systemd-cryptsetup"
         mkdir -p "$initdir/fido2luks"
 
-        inst "$moddir/fido2luks.target" "$systemsystemdunitdir/fido2luks.target"
-        mkdir -p "$systemsystemdunitdir/fido2luks.target.wants"
+        inst "$moddir/fido2luks.target" "$systemdsystemunitdir/fido2luks.target"
+        mkdir -p "$systemdsystemunitdir/fido2luks.target.wants"
 
-        mkdir -p "$systemsystemdunitdir/sysinit.target.wants"
-        ln -sf "$systemsystemdunitdir/fido2luks.target" "$systemsystemdunitdir/sysinit.target.wants/"
+        mkdir -p "$systemdsystemunitdir/sysinit.target.wants"
+        ln -sf "$systemdsystemunitdir/fido2luks.target" "$systemdsystemunitdir/sysinit.target.wants/"
 }