Change modelServiceForm and service to catch more errors
Merge branch 'mantis' into develop