adding rescue from record not found and changes in association of question and option