Index: lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
===================================================================
diff -u -r3f8a54919303711f3b52cdf48b248f102138d9be -red9036e9c8bfe42b4efb380640888938d265ca1d
--- lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java	(.../QbUtils.java)	(revision 3f8a54919303711f3b52cdf48b248f102138d9be)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java	(.../QbUtils.java)	(revision ed9036e9c8bfe42b4efb380640888938d265ca1d)
@@ -39,7 +39,8 @@
     public static void fillFormWithUserCollections(IQbService qbService, String toolSignature, QbQuestionForm form,
 	    Long qbQuestionUid) {
 	final boolean isRequestCameFromTool = StringUtils.isNotBlank(form.getSessionMapID());
-	boolean isDefaultQuestion = qbService.isQuestionDefaultInTool(qbQuestionUid, toolSignature);
+	boolean isDefaultQuestion = qbQuestionUid == null ? false
+		: qbService.isQuestionDefaultInTool(qbQuestionUid, toolSignature);
 	Integer userId = QbUtils.getUserId();
 
 	if (isRequestCameFromTool && !isDefaultQuestion && qbQuestionUid != null) {