Code clean
OFC-1275 - Error publishing a survey into an empty system