Make the null templates compatible with the last Thomas's commit.