diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile
index 186f2ec67212190fc4d9982a485c3f27894f4d4a..5d431494eb9044c58300a011d9d7941c9fd033c0 100644
--- a/silecs-communication-cpp/Makefile
+++ b/silecs-communication-cpp/Makefile
@@ -18,8 +18,8 @@ PRODUCT = communication
 VERSION = 1.0.4
 
 SKIP_MANIFEST = TRUE
-COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
-#COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20
+#COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
 # product configuration
 LIB_NAME = comm
diff --git a/silecs-communication-cpp/releaseSilecs.sh b/silecs-communication-cpp/releaseSilecs.sh
index 22fcb5ee5146aa320eb88299cd2a303a32e8f899..0fcbbadb1358958f96bba2374ebbbf66afa69ace 100755
--- a/silecs-communication-cpp/releaseSilecs.sh
+++ b/silecs-communication-cpp/releaseSilecs.sh
@@ -22,7 +22,7 @@ checkFolderExists()
     if [ ! -d ${FOLDER} ]; then
         echo "Error: The folder '${FOLDER}' is needed in order to finish the installation."
         echo "Installation cancelled."
-        exit 1
+        return 1
     fi
 }
 
@@ -77,6 +77,7 @@ patch()
         INSTALL_DIR=${RELEASE_DIR_BASE}/${PACKAGE}/${NEW_VERSION}
         BASE_DIR=${RELEASE_DIR_BASE}/${PACKAGE}/${BASE_VERSION}
         checkFolderExists ${BASE_DIR}
+	checkFolderExists ${INSTALL_DIR}
         if [ "$PACKAGE" == "$PACKAGE_TO_PATCH" ]; then
             if [ -d ${INSTALL_DIR} ]; then
                if [ -L ${INSTALL_DIR} ]; then
@@ -103,4 +104,4 @@ patch()
         fi
     done
     return 0
-}
\ No newline at end of file
+}
diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile
index 14f2f7a21e436b3b4a9f5f33c5b59611478825d3..28108599b11726780b06b78f93563f41a34df831 100644
--- a/silecs-diagnostic-cpp/Makefile
+++ b/silecs-diagnostic-cpp/Makefile
@@ -19,7 +19,7 @@ VERSION = 1.0.2
 
 SKIP_MANIFEST = TRUE
 #COMMON_MAKE_PATH ?= /common/home/bel/schwinn/lnx/workspace-silecs-neon/generic-makefiles
-COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.8.20
+COMMON_MAKE_PATH ?= /opt/cern/buildsystem/generic/2.9.0
 
 # product configuration
 BIN_NAME = $(PROJECT)-$(PRODUCT)