Fix error handling refactor.

TokenExpired was not properly raised after
c99144b9cd30f9abf3e10c144ee3594004867ac5 due to bad rename from
'error_description' to 'error'.