Fix null / empty dictionary representation