diff --git a/src/main/java/org/olat/modules/forms/ui/EvaluationFormController.java b/src/main/java/org/olat/modules/forms/ui/EvaluationFormController.java
index bb629458702edf5ee923e973ca81a15f2a64f90d..084413b898367a310592486d9939f9cc96985d69 100644
--- a/src/main/java/org/olat/modules/forms/ui/EvaluationFormController.java
+++ b/src/main/java/org/olat/modules/forms/ui/EvaluationFormController.java
@@ -493,7 +493,9 @@ public class EvaluationFormController extends FormBasicController implements Val
 		dbInstance.commit();
 		loadResponses();
 		updateElements();
-		saveAsDoneButton.setVisible(false);
+		if (saveAsDoneButton != null) {
+			saveAsDoneButton.setVisible(false);			
+		}
 		dbInstance.commit();
 		fireEvent(ureq, Event.DONE_EVENT);
 	}