diff --git a/files/helpers/images.py b/files/helpers/images.py
index 1de94252c..d79e5b809 100644
--- a/files/helpers/images.py
+++ b/files/helpers/images.py
@@ -105,13 +105,11 @@ def upload_video(file):
 		try:
 			r = requests.post('https://api.imgur.com/3/upload', headers=headers, files={"video": f})
 
-			print(r.text)
-			#r.raise_for_status()
+			r.raise_for_status()
 
 			resp = r.json()['data']
 		except requests.HTTPError as e:
-			if r: print(r.json())
-			raise UploadException(f"Status code {e.response.status_code} not in range 2**")
+			raise UploadException("Invalid video. Make sure it's 1 minute long or shorter.")
 		except Exception:
 			raise UploadException("Error, please try again later.")
 		finally:
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 81417a911..29d8e94ec 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -857,7 +857,21 @@ def submit_post(v):
 			if file.content_type.startswith('image/'):
 				new_post.url = upload_imgur(file)
 			else:
-				new_post.url = upload_video(file)
+				try:
+					new_post.url = upload_video(file)
+				except UploadException as e:
+					if request.headers.get("Authorization"):
+						return {
+							"error": str(e),
+						}, 400
+					else:
+						return render_template(
+							"submit.html",
+							v=v,
+							error=str(e),
+							title=title,
+							body=request.form.get("body", "")
+						), 400
 
 		g.db.add(new_post)
 		g.db.add(new_post.submission_aux)