diff --git a/app/blueprints/packages/screenshots.py b/app/blueprints/packages/screenshots.py
index 5aec9ae..cb21a56 100644
--- a/app/blueprints/packages/screenshots.py
+++ b/app/blueprints/packages/screenshots.py
@@ -29,13 +29,13 @@ from wtforms.validators import *
 
 
 class CreateScreenshotForm(FlaskForm):
-	title	   = StringField("Title/Caption", [Optional()])
+	title	   = StringField("Title/Caption", [Optional(), Length(-1, 100)])
 	fileUpload = FileField("File Upload", [InputRequired()])
 	submit	   = SubmitField("Save")
 
 
 class EditScreenshotForm(FlaskForm):
-	title	 = StringField("Title/Caption", [Optional()])
+	title	 = StringField("Title/Caption", [Optional(), Length(-1, 100)])
 	approved = BooleanField("Is Approved")
 	delete   = BooleanField("Delete")
 	submit   = SubmitField("Save")
diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py
index e0ee044..b0542ee 100644
--- a/app/tasks/importtasks.py
+++ b/app/tasks/importtasks.py
@@ -226,10 +226,11 @@ def postReleaseCheckUpdate(self, release, path):
 		return tree
 
 	except MinetestCheckError as err:
+		db.session.rollback()
+
 		if "Fails validation" not in release.title:
 			release.title += " (Fails validation)"
 
-		db.session.rollback()
 		release.task_id = self.request.id
 		release.approved = False
 		db.session.commit()