diff --git a/layouts/shortcodes/paige/code.html b/layouts/shortcodes/paige/code.html
index 4a405a9e..4c0c0d02 100644
--- a/layouts/shortcodes/paige/code.html
+++ b/layouts/shortcodes/paige/code.html
@@ -1,4 +1,9 @@
+{{ $content := .Inner | replaceRE "^\n" "" }}
 {{ $lang := .Get 0 | default (.Get "lang") | default "plaintext" }}
 {{ $options := .Get "options" }}
 
-<div class="paige-code">{{ highlight (.Inner | replaceRE "^\n" "") $lang $options }}</div>
+{{ if not $content }}
+    {{ errorf "paige/code: no content" }}
+{{ end }}
+
+<div class="paige-code">{{ highlight $content $lang $options }}</div>
diff --git a/layouts/shortcodes/paige/figure.html b/layouts/shortcodes/paige/figure.html
index 7a4c5d7c..2938a12f 100644
--- a/layouts/shortcodes/paige/figure.html
+++ b/layouts/shortcodes/paige/figure.html
@@ -8,6 +8,10 @@
 {{ $vertical := .Get "vertical" | default "center" }}
 {{ $width := .Get "width" }}
 
+{{ if not $content }}
+    {{ errorf "paige/figure: no content" }}
+{{ end }}
+
 {{ $showcaption := $caption }}
 {{ $sidemargin := "" }}
 {{ $table := false }}
diff --git a/layouts/shortcodes/paige/gallery.html b/layouts/shortcodes/paige/gallery.html
index c8e111e2..9d20d058 100644
--- a/layouts/shortcodes/paige/gallery.html
+++ b/layouts/shortcodes/paige/gallery.html
@@ -13,7 +13,7 @@
 {{ $resources := slice }}
 
 {{ if and (not $images) (not $inner) }}
-    {{ errorf "paige/gallery: no content specified" }}
+    {{ errorf "paige/gallery: no content" }}
 {{ end }}
 
 {{ if not $inner }}
diff --git a/layouts/shortcodes/paige/image.html b/layouts/shortcodes/paige/image.html
index ab5ef4c5..b82bfa94 100644
--- a/layouts/shortcodes/paige/image.html
+++ b/layouts/shortcodes/paige/image.html
@@ -11,7 +11,7 @@
 {{ $width := .Get "width" }}
 
 {{ if not $src }}
-    {{ errorf "paige/image: invalid src: %q" $src }}
+    {{ errorf "paige/image: no content" }}
 {{ end }}
 
 {{ $content := partial "paige/img.html" (dict
diff --git a/layouts/shortcodes/paige/quote.html b/layouts/shortcodes/paige/quote.html
index abf70e35..58bfabe5 100644
--- a/layouts/shortcodes/paige/quote.html
+++ b/layouts/shortcodes/paige/quote.html
@@ -1,5 +1,9 @@
 {{ $content := .Inner | replaceRE "^\n" "" | replaceRE "\n$" "" | markdownify }}
 
+{{ if not $content }}
+    {{ errorf "paige/quote: no content" }}
+{{ end }}
+
 <div class="paige-quote">
     <blockquote class="blockquote">{{ $content }}</blockquote>
 </div>
diff --git a/layouts/shortcodes/paige/vimeo.html b/layouts/shortcodes/paige/vimeo.html
index 33b9ecf9..a6dfcd5c 100644
--- a/layouts/shortcodes/paige/vimeo.html
+++ b/layouts/shortcodes/paige/vimeo.html
@@ -26,6 +26,10 @@
 {{ $video := .Get 0 | default (.Get "video") }}
 {{ $width := .Get "width" }}
 
+{{ if not $video }}
+    {{ errorf "paige/vimeo: no video" }}
+{{ end }}
+
 {{ $params := slice }}
 
 {{ if not $autopause }}
diff --git a/layouts/shortcodes/paige/youtube.html b/layouts/shortcodes/paige/youtube.html
index 8ba7edc8..6c90c69b 100644
--- a/layouts/shortcodes/paige/youtube.html
+++ b/layouts/shortcodes/paige/youtube.html
@@ -14,6 +14,10 @@
 {{ $video := .Get 0 | default (.Get "video") | default "dQw4w9WgXcQ" }}
 {{ $width := .Get "width" }}
 
+{{ if not $video }}
+    {{ errorf "paige/youtube: no video" }}
+{{ end }}
+
 {{ $host := cond site.Config.Privacy.YouTube.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" }}
 
 {{ $path := "" }}