diff --git a/app/blueprints/tasks/__init__.py b/app/blueprints/tasks/__init__.py
index 5ce4b4d7..7ffe0f04 100644
--- a/app/blueprints/tasks/__init__.py
+++ b/app/blueprints/tasks/__init__.py
@@ -55,7 +55,10 @@ def check(id):
 		if current_user.is_authenticated and current_user.rank.at_least(UserRank.ADMIN):
 			info["error"] = str(traceback)
 		elif str(result)[1:12] == "TaskError: ":
-			info["error"] = str(result)[12:-1]
+			if hasattr(result, "value"):
+				info["error"] = result.value
+			else:
+				info["error"] = str(result)
 		else:
 			info["error"] = "Unknown server error"
 	else:
diff --git a/app/templates/tasks/view.html b/app/templates/tasks/view.html
index 5ccba93b..be3b077b 100644
--- a/app/templates/tasks/view.html
+++ b/app/templates/tasks/view.html
@@ -12,7 +12,7 @@
 	<h1>{{ self.title() }}</h1>
 
 	{% if "error" in info or info.status == "FAILURE" or info.status == "REVOKED" %}
-		<pre>{{ info.error }}</pre>
+		<pre style="white-space: pre-wrap; word-wrap: break-word;">{{ info.error }}</pre>
 	{% else %}
 		<script src="/static/js/polltask.js"></script>
 		<script>