Make sure we error out if token retrieval fails on save

Bug: 58359
Change-Id: I07e389c75993cd45e87dd6693b338c4f8b3927be
Merge "Make sure we error out if token retrieval fails on save"