Fix undefined $errstr usage

Change-Id: I50933274c2358e696636a790d2b939e71385f319
Merge "Fix undefined $errstr usage"