diff --git a/src/codegate/extract_snippets/message_extractor.py b/src/codegate/extract_snippets/message_extractor.py
index bea5a2f2..50ec3f3c 100644
--- a/src/codegate/extract_snippets/message_extractor.py
+++ b/src/codegate/extract_snippets/message_extractor.py
@@ -138,7 +138,16 @@ def __init__(self):
             "rs": "rust",
             "java": "java",
         }
-        self._available_languages = ["python", "javascript", "typescript", "go", "rust", "java"]
+        self._available_languages = [
+            "sh",
+            "bash",
+            "python",
+            "javascript",
+            "typescript",
+            "go",
+            "rust",
+            "java",
+        ]  # noqa: E501
 
     @property
     @abstractmethod
@@ -194,7 +203,7 @@ def _ecosystem_from_message(self, message: str):
         Returns:
             Determined language based on message content
         """
-        return self._language_mapping.get(message, None)
+        return self._language_mapping.get(message, message)
 
     def _get_snippet_for_match(self, match: re.Match) -> CodeSnippet:
         matched_snippet = self._get_match_pattern_snippet(match)
diff --git a/src/codegate/pipeline/comment/output.py b/src/codegate/pipeline/comment/output.py
index 8c0a867a..ce70138a 100644
--- a/src/codegate/pipeline/comment/output.py
+++ b/src/codegate/pipeline/comment/output.py
@@ -60,7 +60,15 @@ async def _snippet_comment(self, snippet: CodeSnippet, context: PipelineContext)
                 liklihood = "likely"
             if snippet.language is not None:
                 language = snippet.language
-            comment = f"{comment}\n\n🛡️ CodeGate: The {language} supplied is {liklihood} unsafe. Please check carefully!\n\n"  # noqa: E501
+            if language not in [
+                "python",
+                "javascript",
+                "typescript",
+                "go",
+                "rust",
+                "java",
+            ]:  # noqa: E501
+                comment = f"{comment}\n\n🛡️ CodeGate: The {language} supplied is {liklihood} unsafe. Please check carefully!\n\n"  # noqa: E501
 
         snippet.libraries = PackageExtractor.extract_packages(snippet.code, snippet.language)