diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93d7b88ce..1e5436df6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **BREAKING**: Removed `BedrockLlamaTokenizer`, use `SimpleTokenizer` instead.
 - **BREAKING**: Removed `BedrockTitanTokenizer`, use `SimpleTokenizer` instead.
 - **BREAKING**: Removed `OpenAiChatCompletionPromptDriver` as it uses the legacy [OpenAi Completions API](https://platform.openai.com/docs/api-reference/completions).
+- Improved error message when `GriptapeCloudKnowledgeBaseClient` does not have a description set.
 - Updated `AmazonBedrockPromptDriver` to use [Converse API](https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference.html).
 - `Structure.before_run()` now automatically resolves asymmetrically defined parent/child relationships using the new `Structure.resolve_relationships()`.
 - Updated `HuggingFaceHubPromptDriver` to use `transformers`'s `apply_chat_template`.
diff --git a/griptape/tools/griptape_cloud_knowledge_base_client/tool.py b/griptape/tools/griptape_cloud_knowledge_base_client/tool.py
index 917406cdd..96d24cccf 100644
--- a/griptape/tools/griptape_cloud_knowledge_base_client/tool.py
+++ b/griptape/tools/griptape_cloud_knowledge_base_client/tool.py
@@ -52,4 +52,6 @@ def _get_knowledge_base_description(self) -> str:
             if "description" in response:
                 return response["description"]
             else:
-                raise ValueError(f'Error getting Knowledge Base description: {response["message"]}')
+                raise ValueError(
+                    f"No description found for Knowledge Base {self.knowledge_base_id}. Please set a description, or manually set the `GriptapeCloudKnowledgeBaseClient.description` attribute."
+                )
diff --git a/tests/unit/tools/test_griptape_cloud_knowledge_base_client.py b/tests/unit/tools/test_griptape_cloud_knowledge_base_client.py
index 46270d216..a50929d66 100644
--- a/tests/unit/tools/test_griptape_cloud_knowledge_base_client.py
+++ b/tests/unit/tools/test_griptape_cloud_knowledge_base_client.py
@@ -19,6 +19,18 @@ def client(self, mocker):
             base_url="https://api.griptape.ai", api_key="foo bar", knowledge_base_id="1"
         )
 
+    @pytest.fixture
+    def client_no_description(self, mocker):
+        from griptape.tools import GriptapeCloudKnowledgeBaseClient
+
+        mock_response = mocker.Mock()
+        mock_response.json.return_value = {}
+        mocker.patch("requests.get", return_value=mock_response)
+
+        return GriptapeCloudKnowledgeBaseClient(
+            base_url="https://api.griptape.ai", api_key="foo bar", knowledge_base_id="1"
+        )
+
     def test_query(self, client):
         assert isinstance(client.query({"values": {"query": "foo bar"}}), TextArtifact)
 
@@ -27,3 +39,12 @@ def test_get_knowledge_base_description(self, client):
 
         client.description = "foo bar"
         assert client._get_knowledge_base_description() == "foo bar"
+
+    def test_get_knowledge_base_description_error(self, client_no_description):
+        with pytest.raises(ValueError) as e:
+            client_no_description._get_knowledge_base_description()
+
+            assert (
+                str(e)
+                == f"No description found for Knowledge Base {client_no_description.knowledge_base_id}. Please set a description, or manually set the `GriptapeCloudKnowledgeBaseClient.description` attribute."
+            )