diff --git a/cfn-templates/cid-cfn.yml b/cfn-templates/cid-cfn.yml
index 06ba8b7e..c9542e81 100644
--- a/cfn-templates/cid-cfn.yml
+++ b/cfn-templates/cid-cfn.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deployment of Cloud Intelligence Dashboards v0.2.38
+Description: Deployment of Cloud Intelligence Dashboards v0.2.39
 Metadata:
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -1505,7 +1505,7 @@ Resources:
       Description: An AWS managed layer with a cid-cmd package installed
       Content:
         S3Bucket: !Sub '${LambdaLayerBucketPrefix}-${AWS::Region}'
-        S3Key: 'cid-resource-lambda-layer/cid-0.2.38.zip' #replace version here if needed
+        S3Key: 'cid-resource-lambda-layer/cid-0.2.39.zip' #replace version here if needed
       CompatibleRuntimes:
         - python3.10
 
diff --git a/cid/_version.py b/cid/_version.py
index 673f8188..d7a4a74b 100644
--- a/cid/_version.py
+++ b/cid/_version.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.2.38'
+__version__ = '0.2.39'
diff --git a/cid/helpers/cur.py b/cid/helpers/cur.py
index dea12700..fed012d3 100644
--- a/cid/helpers/cur.py
+++ b/cid/helpers/cur.py
@@ -160,8 +160,8 @@ def metadata(self) -> dict:
             self._tableName = get_parameters().get('cur-table-name')
             try:
                 self._metadata = self.athena.get_table_metadata(self._tableName)
-            except self.athena.exceptions.EntityNotFoundException as exc:
-                raise CidCritical('Provided cur-table-name {self._tableName} is not found.') from exc
+            except self.athena.client.exceptions.EntityNotFoundException as exc:
+                raise CidCritical('Provided cur-table-name "{self._tableName}" is not found. Please make sure the table exists.') from exc
             res, message = self.table_is_cur(table=self._metadata, return_reason=True)
             if not res:
                 raise CidCritical(f'Table {self._tableName} does not look like CUR. {message}')