[Merge] ~nteodosio/software-properties:update-state-after-token-none into software-properties:ubuntu/master

[Nathan Teodosio]

I'm really not convinced about my original proposal.

I to get a better chance of understanding what's going on we need to narrow down where the problem occurs. At any rate a better error message.

This wouldn't really constitute a direct attempt to solve the bug though.
-- 
https://code.launchpad.net/~nteodosio/software-properties/+git/software-properties/+merge/437143
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.