diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b24f6f..d8dda9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@
   (issues #235, #243)
 * Files in `$PMODULES_TMPDIR/<module>` are now removed before
   and after building a module (except cleanup has been disbaled).
-  (issue #242)
+  (issues #242, #245)
 * Set prefix and directory/name of modulefile based on group not on
   environment variables like `{COMPILER,MPI,HDF5}_VERSION` (issue #244)
 
diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index 7d41c41..1a4b6ed 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -1551,6 +1551,7 @@ _build_module() {
 	cleanup_build() {
 		[[ ${enable_cleanup_build} != 'yes' ]] && return 0
 		[[ "${BUILD_DIR}" == "${SRC_DIR}" ]] && return 0
+		[[ -d "${BUILD_DIR}/../.." ]] || return 0
 		{
 			cd "/${BUILD_DIR}/.." || std::die 42 "Internal error"
 			[[ "$(${pwd})" == "/" ]] && \
@@ -1570,6 +1571,7 @@ _build_module() {
 
 	cleanup_src() {
 		[[ ${enable_cleanup_src} != 'yes' ]] && return 0
+		[[ -d "${BUILD_DIR}/../.." ]] || return 0
     		{
 			cd "/${SRC_DIR}/.." || std::die 42 "Internal error"
 			[[ $(pwd) == / ]] && \