diff --git a/lib/libem.bash b/lib/libem.bash
index 0dde4d2..c80016a 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -201,7 +201,7 @@ function em.add_to_family() {
 		die 42 "${FUNCNAME}: Missing family argument."
 	fi
 	if [[ ! -d ${EM_ETCDIR}/${1} ]]; then
-		dir 43 "${1}: family does not exist."
+		die 43 "${1}: family does not exist."
 	fi
 	EM_FAMILY=$1
 	source "${CONFIG_DIR}/versions.conf"
@@ -283,6 +283,9 @@ function _set_env() {
 	    Libraries )
 		EM_MODULENAME="${P}/${V}"
 		;;
+	    System )
+		EM_MODULENAME="${P}/${V}"
+		;;
 	    Compiler )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${P}/${V}"
 		;;