Issue #116 - Fixes NPE when dealing with a previous SurveyInstance