diff --git a/etc/bashrc b/etc/bashrc
index 1cf31e765119d0c2ec293699a18f0c7ddb16054a..7d994701e3e683a5c33c06d54aa1f528edc4f210 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -209,10 +209,11 @@ fi
 
 # Cleanup environment
 # ~~~~~~~~~~~~~~~~~~~
-unset cleaned foamClean foamOldDirs
 
-# Unload functions
-# ~~~~~~~~~~~~~~~~
+#- Functions
 . $WM_PROJECT_DIR/etc/config.sh/functions
 
+#- Variables (do as last for a clean exit code)
+unset cleaned foamClean foamOldDirs
+
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 2fa155d8c79afced56ef1350b001044510d59a23..5c414df74c997659c652584004dad331a5218f6c 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -157,29 +157,29 @@ unset cleaned foamClean foamOldDirs
 
 
 #------------------------------------------------------------------------------
-# Cleanup aliases
+# Cleanup aliases and functions
 
-unalias wmSet
-unalias wmInt32
-unalias wmInt64
-unalias wmSP
-unalias wmDP
+unalias wmSet       2>/dev/null
+unalias wmInt32     2>/dev/null
+unalias wmInt64     2>/dev/null
+unalias wmSP        2>/dev/null
+unalias wmDP        2>/dev/null
 
-unalias wmUnset
+unalias wmUnset     2>/dev/null
 
-unalias wmSchedOn
-unalias wmSchedOff
+unalias wmSchedOn   2>/dev/null
+unalias wmSchedOff  2>/dev/null
 
-unalias foam
-unalias foamSite
+unalias foam        2>/dev/null
+unalias foamSite    2>/dev/null
 
-unalias src
-unalias lib
-unalias app
-unalias sol
-unalias util
-unalias tut
-unalias run
+unalias src         2>/dev/null
+unalias lib         2>/dev/null
+unalias app         2>/dev/null
+unalias sol         2>/dev/null
+unalias util        2>/dev/null
+unalias tut         2>/dev/null
+unalias run         2>/dev/null
 
 unset -f wmRefresh
 unset -f foamVersion