srv-less: replace null with undefined. (#1409)