Added a bunch of tries... ;)
Merge branch 'hotfix/survey_errors'