Make errors clearer. Fix error when no token provided