Added undocumented subscription state
Updated error handling to API 2.0