Merge "dumpstate: handle errors gracefully"