Properly handle token new error