Fix: Splitted handling of variables to avoid null cases

coscine/issues#2583

Merge request reports

Loading