diff --git a/lib/yashchiki/generate_modules.sh b/lib/yashchiki/generate_modules.sh
index 84a020cec6e3ca8be5c581a4762a005e088a95d0..83bfe28f8fdcbdfa6886d3f33b66d3730bf9f742 100755
--- a/lib/yashchiki/generate_modules.sh
+++ b/lib/yashchiki/generate_modules.sh
@@ -33,7 +33,7 @@ source "${PATH_MODULES}/\$(readlink -f /proc/\$\$/exe | xargs -r basename)"
 EOF
 
 # Provide MODULESHOME for all singularity environments
-cat <<EOF >> ${SINGULARITY_ENVIRONMENT}
+cat <<EOF >> ${SINGULARITY_ENVIRONMENT:-/environment.sh}
 MODULESHOME=${MODULESHOME}
 export MODULESHOME
 EOF
@@ -42,9 +42,11 @@ EOF
 # to use after sourcing /opt/init/modules.sh
 (
 IFS=$'\n'
+if [ -d "/opt/spack/share/spack/modules" ]; then
 for moduledir in $(find /opt/spack/share/spack/modules -mindepth 1 -maxdepth 1 -type d); do
 cat <<EOF >> "${TARGET}"
 export MODULEPATH="${moduledir}\${MODULEPATH:+:\${MODULEPATH}}"
 EOF
 done
+fi
 )