Fix: use String ctor function instead of toString to handle nulls