diff --git a/tpl/yourlsproxy.php b/tpl/yourlsproxy.php
index c451c5a2..f642047d 100644
--- a/tpl/yourlsproxy.php
+++ b/tpl/yourlsproxy.php
@@ -17,7 +17,9 @@ if (empty($ERROR)) :
 <?php
 else:
 ?>
-		<p><?php echo I18n::_('Could not create paste: %s', $ERROR); ?></p>
+		<div id="errormessage">
+			<p><?php echo I18n::_('Could not create paste: %s', $ERROR); ?></p>
+		</div>
 <?php
 endif;
 ?>
diff --git a/tst/ViewTest.php b/tst/ViewTest.php
index 1e4d9374..3e8a8aea 100644
--- a/tst/ViewTest.php
+++ b/tst/ViewTest.php
@@ -106,6 +106,10 @@ class ViewTest extends PHPUnit_Framework_TestCase
                 $content,
                 $template . ': outputs error correctly'
             );
+            if ($template === 'yourlsproxy') {
+                // yourlsproxy template only displays error message
+                continue;
+            }
             $this->assertRegExp(
                 '#<[^>]+id="password"[^>]*>#',
                 $content,