Adding empty token check
Get rid of sysout :)