Debug markers added for SurveyService

Narrowing the exception origin