BACKLOG-1375 Do not try to create an entry in a value that isn't an array (might need further fixing)