diff --git a/test/pytest/test_helmreleases.py b/test/pytest/test_helmreleases.py
index 058e6cab7168bcb602f45f5a394452d555aa0dec..11e875de81c9c02a5c54159ff4e1c13c4f17719a 100644
--- a/test/pytest/test_helmreleases.py
+++ b/test/pytest/test_helmreleases.py
@@ -1,5 +1,6 @@
 import pytest
 from kubernetes import client, config
+from kubernetes.client.rest import ApiException
 
 
 def get_release(name, namespace, api):
@@ -15,11 +16,15 @@ def get_release(name, namespace, api):
         release_name = release['status']['releaseName']
         release_status = release['status']['releaseStatus']
         print(release_status)
-    except Exception as e:
-        release_name = 'n/a'
-        release_status = 'n/a'
+    except ApiException as e:
+        if e.status == 404:
+            release_name = None
+            release_status = 'not found'
+        else:
+            release_name = None
+            release_status = None
+            print("Exception: %s" % e)
         print("**** NOT DEPLOYED, status: %s *****" % release_status)
-        print("Exception: %s" % e)
 
     return(release_name, release_status)