Issue #230 - Prevents NPE when uploading data for non existent Survey