Fix #15: fix null string as token