diff --git a/check_odoo2_storage.sh b/check_odoo2_storage.sh
index 4a6b6190abf821fbd3d24f08cbb23db9fe05f575..adb56f8be2a0b520582304ceec1848b0f6127d02 100755
--- a/check_odoo2_storage.sh
+++ b/check_odoo2_storage.sh
@@ -9,11 +9,14 @@ RETURN_CODE="0"
 for file in `ls /backup/odoo2/*.latest`
 do
     CONTAINER=$(grep "Container:" $file | cut -d ":" -f 2  | tr -d " ")
+    if [[ "$CONTAINER" == 'tuleap_filament_dedicated2' ]] ; then
+      continue
+    fi
     BYTES=$(grep "Bytes:" $file | cut -d ":" -f 2  | tr -d " ")
     OBJECTS=$(grep "Objects:" $file | cut -d ":" -f 2  | tr -d " ")
     LAST_FULL_BACKUP=$(grep full-signature $file | tail -1)
     LAST_INC_BACKUP=$(grep new-signature $file | tail -1)
-    if [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ] || [ `date -d "${LAST_INC_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ] 
+    if ([ -n "$LAST_FULL_BACKUP" ] && [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]) || ([ -n "$LAST_INC_BACKUP" ] && [ `date -d "${LAST_INC_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]) 
     then
         OUTPUT+="OK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Full-Backup: ${LAST_FULL_BACKUP:5:19}, Last-Incremental-Backup: ${LAST_INC_BACKUP:5:19}\n"
     else 
diff --git a/check_odoo_storage.sh b/check_odoo_storage.sh
index dedc6d7f931da6f5810e2cf83a016434bf3b6fb5..6f36866276ad3f312b97f54d4ce7eeaa1072a24f 100755
--- a/check_odoo_storage.sh
+++ b/check_odoo_storage.sh
@@ -9,11 +9,14 @@ RETURN_CODE="0"
 for file in `ls /backup/odoo/*.latest`
 do
     CONTAINER=$(grep "Container:" $file | cut -d ":" -f 2  | tr -d " ")
+    if [[ "$CONTAINER" == 'odoo_oikos' ]] || [[ "$CONTAINER" == 'tuleap_filament_dedicated2' ]] ; then
+      continue
+    fi
     BYTES=$(grep "Bytes:" $file | cut -d ":" -f 2  | tr -d " ")
     OBJECTS=$(grep "Objects:" $file | cut -d ":" -f 2  | tr -d " ")
     LAST_FULL_BACKUP=$(grep full-signature $file | tail -1)
     LAST_INC_BACKUP=$(grep new-signature $file | tail -1)
-    if [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ] || [ `date -d "${LAST_INC_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ] 
+    if ([ -n "$LAST_FULL_BACKUP" ] && [ `date -d "${LAST_FULL_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]) || ([ -n "$LAST_INC_BACKUP" ] && [ `date -d "${LAST_INC_BACKUP:5:19}" +%s` -gt `date -d '1 day ago' +%s` ]) 
     then
         OUTPUT+="OK: Container: $CONTAINER, Size: $BYTES, # Files: $OBJECTS, Last-Full-Backup: ${LAST_FULL_BACKUP:5:19}, Last-Incremental-Backup: ${LAST_INC_BACKUP:5:19}\n"
     else