diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 0b22e1c9..3bc4c062 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -41,24 +41,14 @@ jobs:
           pip install -r requirements_dev.txt
       - name: Delete default runner images
         run: |
-          docker image rm node:14
-          docker image rm node:14-alpine
           docker image rm node:16
           docker image rm node:16-alpine
           docker image rm node:18
           docker image rm node:18-alpine
           docker image rm node:20
-          docker image rm node:20-alpine
-          docker image rm buildpack-deps:buster
-          docker image rm buildpack-deps:bullseye
           docker image rm debian:10
           docker image rm debian:11
           docker image rm moby/buildkit:latest
-          docker image rm alpine:3.16
-          docker image rm alpine:3.17
-          docker image rm alpine:3.18
-          docker image rm ubuntu:18.04
-          docker image rm ubuntu:20.04
       - name: Wait for contracts deployment and C2D cluster to be ready
         working-directory: ${{ github.workspace }}/barge
         run: |
diff --git a/ocean_provider/utils/util.py b/ocean_provider/utils/util.py
index 013bf4f2..483f48ff 100644
--- a/ocean_provider/utils/util.py
+++ b/ocean_provider/utils/util.py
@@ -55,20 +55,29 @@ def get_service_files_list(
                     f"Provider {network_name}: Key {key} not found in files."
                 )
 
-        if Web3.toChecksumAddress(
-            files_json["datatokenAddress"]
-        ) != Web3.toChecksumAddress(service.datatoken_address):
+        try:
+            if Web3.toChecksumAddress(
+                files_json["datatokenAddress"]
+            ) != Web3.toChecksumAddress(service.datatoken_address):
+                raise Exception(
+                    f"Provider {network_name}: Mismatch of datatoken. Got {files_json['datatokenAddress']} vs expected {service.datatoken_address}"
+                )
+        except Exception as e:
             raise Exception(
-                f"Provider {network_name}: Mismatch of datatoken. Got {files_json['datatokenAddress']} vs expected {service.datatoken_address}"
+                f"Provider {network_name}: Invalid datatokenAddress. Got {files_json['datatokenAddress']} vs expected {service.datatoken_address}"
             )
 
-        if Web3.toChecksumAddress(files_json["nftAddress"]) != Web3.toChecksumAddress(
-            asset.nftAddress
-        ):
+        try:
+            if Web3.toChecksumAddress(
+                files_json["nftAddress"]
+            ) != Web3.toChecksumAddress(asset.nftAddress):
+                raise Exception(
+                    f"Provider {network_name}: Mismatch of dataNft. Got {files_json['nftAddress']} vs expected {asset.nftAddress}"
+                )
+        except:
             raise Exception(
-                f"Provider {network_name}: Mismatch of dataNft. Got {files_json['nftAddress']} vs expected {asset.nftAddress}"
+                f"Provider {network_name}: Invalid nftAddress. Got {files_json['nftAddress']} vs expected {asset.nftAddress}"
             )
-
         files_list = files_json["files"]
         if not isinstance(files_list, list):
             raise TypeError(