Changed to new error handling.

BUG=

Review URL: https://chromiumcodereview.appspot.com//12422007