Fix null-creation behaviour