diff --git a/layouts/shortcodes/codeberg.html b/layouts/shortcodes/codeberg.html
index 067175f9..ccaeca18 100644
--- a/layouts/shortcodes/codeberg.html
+++ b/layouts/shortcodes/codeberg.html
@@ -56,4 +56,6 @@
         data-repo-id="{{ $id }}"></script>
     </a>
   </div>
+{{- else -}}
+  {{ warnf "codeberg shortcode: unable to fetch %q: %s" $codebergURL .Position }}
 {{- end -}}
diff --git a/layouts/shortcodes/codeimporter.html b/layouts/shortcodes/codeimporter.html
index e4467ddf..6ecdc003 100644
--- a/layouts/shortcodes/codeimporter.html
+++ b/layouts/shortcodes/codeimporter.html
@@ -15,7 +15,7 @@
   {{ end }}
 
   {{ if gt $startLine $endLine }}
-    {{ errorf "Code Importer Shortcode - startLine is greater than endLine" . }}
+    {{ errorf "codeimporter shortcode: startLine is greater than endLine" . }}
   {{ end }}
 
   {{ $selectedLines := first $endLine $lines }}
@@ -23,5 +23,5 @@
   {{ $codeBlock := printf "```%s\n%s\n```" $type (delimit $selectedLines "\n") }}
   {{ $codeBlock | markdownify }}
 {{ else }}
-  {{ errorf "Code Importer Shortcode - Unable to get remote resource" . }}
+  {{ warnf "codeimporter shortcode: unable to fetch %q: %s" $url .Position }}
 {{ end }}
diff --git a/layouts/shortcodes/forgejo.html b/layouts/shortcodes/forgejo.html
index 666f5f0a..775a3a59 100644
--- a/layouts/shortcodes/forgejo.html
+++ b/layouts/shortcodes/forgejo.html
@@ -56,4 +56,6 @@
         data-repo-id="{{ $id }}"></script>
     </a>
   </div>
+{{- else -}}
+  {{ warnf "forgejo shortcode: unable to fetch %q: %s" $forgejoURL .Position }}
 {{- end -}}
diff --git a/layouts/shortcodes/gitea.html b/layouts/shortcodes/gitea.html
index 511ee4ae..fcf0f8fb 100644
--- a/layouts/shortcodes/gitea.html
+++ b/layouts/shortcodes/gitea.html
@@ -56,4 +56,6 @@
         data-repo-id="{{ $id }}"></script>
     </a>
   </div>
+{{- else -}}
+  {{ warnf "gitea shortcode: unable to fetch %q: %s" $giteaURL .Position }}
 {{- end -}}
diff --git a/layouts/shortcodes/github.html b/layouts/shortcodes/github.html
index d333972b..05be3d4e 100644
--- a/layouts/shortcodes/github.html
+++ b/layouts/shortcodes/github.html
@@ -4,9 +4,8 @@
 {{- $githubThumbnailURL := print "https://opengraph.githubassets.com/0/" (.Get "repo") -}}
 {{- $showThumbnail := .Get "showThumbnail" | default true -}}
 
-
-<div class="github-card-wrapper">
-  {{- with $githubData -}}
+{{- with $githubData -}}
+  <div class="github-card-wrapper">
     <a id="{{ $id }}" target="_blank" href="{{ .html_url }}" class="cursor-pointer">
       <div
         class="w-full md:w-auto p-0 m-0 border border-neutral-200 dark:border-neutral-700 border rounded-md shadow-2xl">
@@ -71,5 +70,7 @@
         data-repo-url="{{ $githubURL }}"
         data-repo-id="{{ $id }}"></script>
     </a>
-  {{- end -}}
-</div>
+  </div>
+{{- else -}}
+  {{ warnf "github shortcode: unable to fetch %q: %s" $githubURL .Position }}
+{{- end -}}
diff --git a/layouts/shortcodes/mdimporter.html b/layouts/shortcodes/mdimporter.html
index db50adba..2b7bab9c 100644
--- a/layouts/shortcodes/mdimporter.html
+++ b/layouts/shortcodes/mdimporter.html
@@ -2,5 +2,5 @@
 {{ with resources.GetRemote (urls.Parse $url) }}
   {{ .Content | markdownify }}
 {{ else }}
-  {{ errorf "Mardown Importer Shortcode - Unable to get remote resource" . }}
+  {{ warnf "mdimporter shortcode: unable to fetch %q: %s" $url .Position }}
 {{ end }}