diff --git a/hstream-kafka/HStream/Kafka/Server/Core/Topic.hs b/hstream-kafka/HStream/Kafka/Server/Core/Topic.hs
index d4fb63e65..ed21fba16 100644
--- a/hstream-kafka/HStream/Kafka/Server/Core/Topic.hs
+++ b/hstream-kafka/HStream/Kafka/Server/Core/Topic.hs
@@ -58,7 +58,7 @@ createTopic ServerContext{..} name replicationFactor numPartitions configs = do
         Left (e :: SomeException)
           | isJust (fromException @S.EXISTS e) -> do
             Log.warning $ "Topic already exists: " <> Log.build name
-            return ((K.TOPIC_ALREADY_EXISTS, "Topic " <> name <> " already exists"), [])
+            return ((K.TOPIC_ALREADY_EXISTS, "Topic '" <> name <> "' already exists."), [])
           | otherwise -> do
               Log.warning $ "Exception occurs when creating stream " <> Log.build (show streamId) <> ": " <> Log.build (show e)
               return ((K.UNKNOWN_SERVER_ERROR, "Unexpected Server error"), [])
diff --git a/hstream-kafka/HStream/Kafka/Server/Handler/Topic.hs b/hstream-kafka/HStream/Kafka/Server/Handler/Topic.hs
index ede491b93..2fef7e148 100644
--- a/hstream-kafka/HStream/Kafka/Server/Handler/Topic.hs
+++ b/hstream-kafka/HStream/Kafka/Server/Handler/Topic.hs
@@ -66,9 +66,9 @@ handleCreateTopics ctx@ServerContext{scLDClient} reqCtx K.CreateTopicsRequest{..
                   exist <- S.doesStreamExist scLDClient streamId
                   if exist
                     then do
-                      Log.info $ "Topic " <> Log.build name <> " already exist."
+                      Log.info $ "Topic " <> Log.build name <> " already exists."
                       return K.CreatableTopicResult
-                         { errorMessage=Just $ "Topic " <> name <> " already exist."
+                         { errorMessage=Just $ "Topic '" <> name <> "' already exists."
                          , errorCode=K.TOPIC_ALREADY_EXISTS
                          , name=name
                          }