diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb
index 12ae4473b..b2d9168b2 100644
--- a/app/models/form_handler.rb
+++ b/app/models/form_handler.rb
@@ -47,7 +47,7 @@ class FormHandler
         form = Form.new(form_path)
 
         form_to_set = form_name_from_start_year(form.start_date.year, "lettings")
-        forms[form_to_set] = form if forms[form_to_set].blank?
+        forms[form_to_set] = form if form_to_set && forms[form_to_set].blank?
       end
     end