diff --git a/src/BuildError.elm b/src/BuildError.elm
index 4cdac48a9..fee1292e2 100644
--- a/src/BuildError.elm
+++ b/src/BuildError.elm
@@ -4,5 +4,6 @@ import TerminalText
 
 
 type alias BuildError =
-    { message : List TerminalText.Text
+    { title : String
+    , message : List TerminalText.Text
     }
diff --git a/src/Pages/ContentCache.elm b/src/Pages/ContentCache.elm
index c5e8b923e..cfced1612 100644
--- a/src/Pages/ContentCache.elm
+++ b/src/Pages/ContentCache.elm
@@ -138,7 +138,8 @@ createErrors path decodeError =
 
 createBuildError : List String -> String -> BuildError
 createBuildError path decodeError =
-    { message =
+    { title = "Metadata Decode Error"
+    , message =
         [ Terminal.text "I ran into a problem when parsing the metadata for the page with this path: "
         , Terminal.text ("/" ++ (path |> String.join "/"))
         , Terminal.text "\n\n"
diff --git a/src/Pages/Internal/Platform/Cli.elm b/src/Pages/Internal/Platform/Cli.elm
index 672c20ad3..79cd808b5 100644
--- a/src/Pages/Internal/Platform/Cli.elm
+++ b/src/Pages/Internal/Platform/Cli.elm
@@ -387,7 +387,10 @@ init toModel contentCache siteMetadata config flags =
             updateAndSendPortIfDone
                 (Model Dict.empty
                     SecretsDict.masked
-                    [ InternalError <| { message = [ Terminal.text <| "Failed to parse flags: " ++ Decode.errorToString error ] }
+                    [ InternalError <|
+                        { title = "Internal Error"
+                        , message = [ Terminal.text <| "Failed to parse flags: " ++ Decode.errorToString error ]
+                        }
                     ]
                     Dict.empty
                     Dev
@@ -459,7 +462,8 @@ update siteMetadata config msg model =
                                 | errors =
                                     model.errors
                                         ++ [ FailedStaticHttpRequestError
-                                                { message =
+                                                { title = "Static HTTP Error"
+                                                , message =
                                                     [ Terminal.text "I got an error making an HTTP request to this URL: "
 
                                                     -- TODO include HTTP method, headers, and body
@@ -480,7 +484,7 @@ update siteMetadata config msg model =
                                                             Terminal.text "Network error"
 
                                                         Http.BadBody string ->
-                                                            Terminal.text "Network error"
+                                                            Terminal.text "Unable to parse HTTP response body"
                                                     ]
                                                 }
                                            ]
diff --git a/src/Pages/StaticHttpRequest.elm b/src/Pages/StaticHttpRequest.elm
index 03917625d..5817c9f99 100644
--- a/src/Pages/StaticHttpRequest.elm
+++ b/src/Pages/StaticHttpRequest.elm
@@ -57,7 +57,8 @@ urls request =
 
 toBuildError : String -> Error -> BuildError
 toBuildError path error =
-    { message =
+    { title = "Static HTTP Error"
+    , message =
         [ Terminal.text path
         , Terminal.text "\n\n"
         , Terminal.text (errorToString error)
diff --git a/src/Secrets.elm b/src/Secrets.elm
index 41985aab4..08fc8213d 100644
--- a/src/Secrets.elm
+++ b/src/Secrets.elm
@@ -65,7 +65,8 @@ buildError secretName secretsDict =
         availableEnvironmentVariables =
             SecretsDict.available secretsDict
     in
-    { message =
+    { title = "Missing Secret"
+    , message =
         [ Terminal.text "I expected to find this Secret in your environment variables but didn't find a match:\n\nSecrets.get \""
         , Terminal.text secretName
         , Terminal.text "\"\n             "