diff --git a/plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb b/plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb
index 76fae3b..f200c64 100644
--- a/plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb
+++ b/plugins/custom_forms/lib/custom_forms_plugin/membership_survey.rb
@@ -9,6 +9,8 @@ class CustomFormsPlugin::MembershipSurvey < Task
 
   def perform
     form = CustomFormsPlugin::Form.find(form_id)
+    raise 'Form expired' if form.expired?
+
     answers = build_answers(submission, form)
     s = CustomFormsPlugin::Submission.create!(:form => form, :profile => target)
     answers.map {|answer| answer.submission = s; answer.save!}
diff --git a/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb b/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
index 0c802be..0c63425 100644
--- a/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
+++ b/plugins/custom_forms/views/tasks/custom_forms_plugin/_membership_survey_accept_details.html.erb
@@ -3,8 +3,10 @@
 
 <h2><%= @form.name %></h2>
 <p><%= @form.description %></p>
+<% if @form.expired? %>
+  <h3><%= _('Sorry, you can\'t fill this form right now') %></h3>
+<% end %>
 
 <% f.fields_for :submission do |fi| %>
-  <%#= fi.error_messages_for :submission %>
   <%= render :partial => 'shared/form_submission', :locals => {:f => fi} %>
 <% end %>
--
libgit2 0.21.2