diff --git a/modules/saml/templates/proxy/invalid_session.twig b/modules/saml/templates/proxy/invalid_session.twig
new file mode 100644
index 0000000000000000000000000000000000000000..c970efabfa76c4b24389b0c8d4fdf90b987fc9f4
--- /dev/null
+++ b/modules/saml/templates/proxy/invalid_session.twig
@@ -0,0 +1,12 @@
+{% set pagetitle = 'SimpleSAMLphp'|trans %}
+{% extends "base.twig" %}
+
+{% block content %}
+    <h2>{{ '{saml:proxy:invalid_idp}'|trans }}</h2>
+    <p>{{ '{saml:proxy:invalid_idp_description}'|trans({"%IDP%": idp_name, "%SP%": sp_name}, "app")|raw</p>
+    <form method="post" action="?">
+        <input type="hidden" name="AuthState" value="{{ AuthState|escape('html') }}" />
+        <input type="submit" name="continue" value="{{ '{general:yes_continue}'|trans }}" />
+        <input type="submit" name="cancel" value="{{ '{general:no_cancel}'|trans }}" />
+    </form>
+{% endblock %}
diff --git a/modules/saml/templates/sp/wrong_authncontextclassref.twig b/modules/saml/templates/sp/wrong_authncontextclassref.twig
new file mode 100644
index 0000000000000000000000000000000000000000..5a5012c87407efe0f5f5259756c596f795d75472
--- /dev/null
+++ b/modules/saml/templates/sp/wrong_authncontextclassref.twig
@@ -0,0 +1,7 @@
+{% set pagetitle = 'SimpleSAMLphp'|trans %}
+{% extends "base.twig" %}
+
+{% block content %}
+    <h2>{{ '{saml:wrong_authncontextclassref:header}'|trans|escape('html') }}</h2>
+    <p>{{ '{saml:wrong_authncontextclassref:description}'|trans|escape('html') }}</p>
+{% endblock %}
diff --git a/templates/error.twig b/templates/error.twig
index 4aa7739933d6c02a3164235f4eaacc4b47bf36ce..d312c2cb30c680f018f848f8f1f2eb5411a48a38 100644
--- a/templates/error.twig
+++ b/templates/error.twig
@@ -35,8 +35,7 @@
         <h2>{{'{errors:debuginfo_header}' | trans}}</h2>
         <p>{{'{errors:debuginfo_text}' | trans}}</p>
         <div class="code-box code-box-content">
-            <pre>{{ error.exceptionMsg }}<br>
-                {{ error.exceptionTrace }}
+            <pre>{{ error.exceptionMsg }}<br />{{ error.exceptionTrace }}
             </pre>
         </div>
     {%- endif %}
@@ -62,4 +61,4 @@
     <h2>{{ '{errors:howto_header}' | trans }}</h2>
     <p>{{ '{errors:howto_text}' | trans }}</p>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}