Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -rb688f852f5068e201101657aee0f735dd5998647
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision b688f852f5068e201101657aee0f735dd5998647)
@@ -141,7 +141,7 @@
 	form.setContentFolderID(qbQuestion.getContentFolderId() == null ? "temp" : qbQuestion.getContentFolderId());
 	form.setTitle(qbQuestion.getName());
 	form.setQuestion(qbQuestion.getDescription());
-	form.setMaxMark(qbQuestion.getMaxMark());
+	form.setMaxMark(qbQuestion.getMaxMark()== null ? 1 : qbQuestion.getMaxMark());
 	form.setPenaltyFactor(String.valueOf(qbQuestion.getPenaltyFactor()));
 	form.setAnswerRequired(qbQuestion.isAnswerRequired());
 	form.setFeedback(qbQuestion.getFeedback());
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
===================================================================
diff -u -rd709559abc2186520af2f18c3fc7417a5a598e9e -rb688f852f5068e201101657aee0f735dd5998647
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(.../patch20190110.sql)	(revision d709559abc2186520af2f18c3fc7417a5a598e9e)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql	(.../patch20190110.sql)	(revision b688f852f5068e201101657aee0f735dd5998647)
@@ -486,7 +486,7 @@
 
 	
 -- fill Question Bank question table with unique questions, with manually incremented question ID
-INSERT INTO lams_qb_question SELECT NULL, aq.question_type, @question_id:=@question_id + 1, 1, IFNULL(assessment.create_date, NOW()), 
+INSERT INTO lams_qb_question SELECT NULL, aq.question_type, @question_id:=@question_id + 1, 1, IFNULL(assessment.create_date, NOW()), 'temp_folder',
 				IFNULL(aq.question, ''), aq.description, IFNULL(aq.max_mark, 1), aq.feedback, aq.penalty_factor, aq.answer_required,
 				aq.multiple_answers_allowed, aq.incorrect_answer_nullifies_mark, aq.feedback_on_correct, aq.feedback_on_partially_correct,
 				aq.feedback_on_incorrect, aq.shuffle, aq.prefix_answers_with_letters, aq.case_sensitive, aq.correct_answer,